Skip to content

Fix stale Java release preparation #2543

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

Merged
devm33 merged 2 commits into from
Sep 4, 2026
+30 −11
Merged

Fix stale Java release preparation #2543

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
45dd6bd
Fix stale Java release preparation
devm33 Sep 4, 2026
7525814
Revalidate derived Java release version
devm33 Sep 4, 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
41 changes: 30 additions & 11 deletions .github/workflows/java-publish-maven.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,12 +90,13 @@ jobs:
development_version: ${{ steps.versions.outputs.development_version }}
release_tag: ${{ steps.release-identity.outputs.release_tag }}
tag_commit: ${{ steps.release-identity.outputs.tag_commit }}
pre_prepare_commit: ${{ steps.pre-prepare.outputs.pre_prepare_commit }}
pre_prepare_commit: ${{ steps.update-docs.outputs.pre_prepare_commit }}
post_prepare_commit: ${{ steps.release-identity.outputs.post_prepare_commit }}
docs_commit: ${{ steps.update-docs.outputs.docs_commit_sha }}
steps:
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
with:
ref: main
fetch-depth: 0
token: ${{ secrets.JAVA_RELEASE_TOKEN }}

Expand Down Expand Up @@ -150,16 +151,34 @@ jobs:
run: |
VERSION="${{ steps.versions.outputs.release_version }}"
DEV_VERSION="${{ steps.versions.outputs.development_version }}"
./scripts/test-update-documentation-versions.sh
./scripts/update-documentation-versions.sh "$VERSION" "$DEV_VERSION" README.md sdk/jbang-example.java
git add README.md sdk/jbang-example.java
git commit -m "docs: update version references to ${VERSION}"
echo "docs_commit_sha=$(git rev-parse HEAD)" >> "$GITHUB_OUTPUT"
git push origin main

- name: Record rollback base
id: pre-prepare
run: echo "pre_prepare_commit=$(git rev-parse HEAD^)" >> "$GITHUB_OUTPUT"

for attempt in 1 2 3; do
git fetch origin main
git reset --hard origin/main
if [ -z "${{ inputs.releaseVersion }}" ]; then
LIVE_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
if [ "${LIVE_VERSION%-SNAPSHOT}" != "$VERSION" ]; then
echo "::error::main advanced from release version $VERSION to ${LIVE_VERSION%-SNAPSHOT}; restart the release with the current version."
exit 1
fi
fi
./scripts/test-update-documentation-versions.sh
./scripts/update-documentation-versions.sh "$VERSION" "$DEV_VERSION" README.md sdk/jbang-example.java
git add README.md sdk/jbang-example.java
git commit -m "docs: update version references to ${VERSION}"

if git push origin HEAD:main; then
echo "pre_prepare_commit=$(git rev-parse HEAD^)" >> "$GITHUB_OUTPUT"
echo "docs_commit_sha=$(git rev-parse HEAD)" >> "$GITHUB_OUTPUT"
break
fi

if [ "$attempt" -eq 3 ]; then
echo "::error::main continued to advance while preparing the Java release."
exit 1
fi
echo "main advanced during release preparation; retrying from the latest commit."
done

- name: Prepare Release
run: |
Expand Down
Loading