Skip to content

fix(ci): requalify exact merged release commits #263

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
alongubkin merged 2 commits into from
Jul 30, 2026
Merged

fix(ci): requalify exact merged release commits #263

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2121b86
fix(ci): requalify exact merged release commits
alongubkin Jul 30, 2026
7f5e4c5
fix(ci): select matching release merge association
alongubkin Jul 30, 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
16 changes: 13 additions & 3 deletions .github/workflows/release-qualification.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,21 @@ jobs:
else
PR_JSON=$(gh api \
-H "Accept: application/vnd.github+json" \
"/repos/${GITHUB_REPOSITORY}/commits/${SOURCE_REF}/pulls" \
--jq '[.[] | select(.base.ref == "main")] | sort_by(.updated_at) | last')
"/repos/${GITHUB_REPOSITORY}/commits/${SOURCE_REF}/pulls" |
jq --arg source "$SOURCE_REF" \
'[.[] | select(.base.ref == "main" and .merge_commit_sha == $source)] | last')
HEAD_REPOSITORY=$(jq -r '.head.repo.full_name // empty' <<< "$PR_JSON")
HEAD_REF=$(jq -r '.head.ref // empty' <<< "$PR_JSON")
BASE_SHA=$(jq -r '.base.sha // empty' <<< "$PR_JSON")
MERGE_COMMIT_SHA=$(jq -r '.merge_commit_sha // empty' <<< "$PR_JSON")
if [ "$MERGE_COMMIT_SHA" != "$SOURCE_REF" ]; then
echo "::error::Workflow dispatch requalification requires the exact merged release commit"
exit 1
fi
Comment thread
greptile-apps[bot] marked this conversation as resolved.
# The PR's recorded base can be stale when another PR lands between
# qualification and merge. Compare the exact merged commit with its
# first parent so concurrent main changes are not misclassified as
# release-PR changes.
BASE_SHA=$(git rev-parse "${SOURCE_REF}^")
fi

CURRENT_VERSION=$(sed -n '/^\[workspace.package\]/,/^\[/s/^version = "\(.*\)"/\1/p' Cargo.toml)
Expand Down
Loading