Skip to content

CASSANDRA-21629: Backport CASSANDRA-18145 #5083

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
driftx wants to merge 2 commits into
base: trunk
Choose a base branch
from
+816 −4
Open

CASSANDRA-21629: Backport CASSANDRA-18145 #5083

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
853728c
local ci runner script
driftx Aug 31, 2026
9685801
fix minor bugs
driftx Aug 31, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .build/ci/generate-ci-summary.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ cat >${DIST_DIR}/ci_summary.html <<EOL
<h1>CI Summary ${BUILD_TAG}</h1>
<h2>Build State</h2>
<ul>
<li>sha: $(git ls-files -s ${CASSANDRA_DIR} | git hash-object --stdin)</li>
<li>sha: $(git -C ${CASSANDRA_DIR} ls-files -s | git hash-object --stdin)</li>
<li>repo: $(git -C ${CASSANDRA_DIR} remote get-url origin)</li>
<li>branch: $(git -C ${CASSANDRA_DIR} branch --remote --verbose --no-abbrev --contains | sed -rne 's/^[^\/]*\/([^\ ]+).*$/\1/p')</li>
<li>date: $(date)</li>
Expand All @@ -60,7 +60,7 @@ cat >${DIST_DIR}/ci_summary.html <<EOL
<li>profile_custom_regexp: ${PROFILE_CUSTOM_REGEXP}</li>
<li>architecture: ${ARCHITECTURE}</li>
<li>jdk: ${JDK}</li>
<li>dtest_repository: {DTEST_REPOSITORY}</li>
<li>dtest_repository: ${DTEST_REPOSITORY}</li>
<li>dtest_branch: ${DTEST_BRANCH}</li>
</ul>
</body>
Expand Down
7 changes: 5 additions & 2 deletions .build/docker/_build-debian.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,12 @@ set -e

# note, this edits files in your working cassandra directory
pushd $CASSANDRA_DIR >/dev/null
# Restore the changelog on both success and failure so a retried cell does not stack
# generated versions from its previous attempt.
trap 'git -C "${CASSANDRA_DIR}" restore debian/changelog || true' EXIT
export BUILD_DIR="$(realpath --relative-to=$CASSANDRA_DIR ${DIST_DIR})"
export DEBFULLNAME="${DEBFULLNAME:-Apache Cassandra build}"
export DEBEMAIL="${DEBEMAIL:-dev@cassandra.apache.org}"

# Used version for build will always depend on the git referenced used for checkout above
# Branches will always be created as snapshots, while tags are releases
Expand Down Expand Up @@ -128,7 +133,5 @@ set +e
mv ../cassandra[-_]*${CASSANDRA_VERSION}* "${DIST_DIR}"
# clean build deps
rm -f cassandra-build-deps_*
# restore debian/changelog
git restore debian/changelog || true

popd >/dev/null
Loading