fix(release): compare version bumps from branch base - #113
Merged
Conversation
Why: - Codex review found that the version-bump guard compared feature branches against the base tip and fell back to HEAD^, which could flag base-only changes or miss earlier sensitive commits in multi-commit branches. - Push events on main also need to compare against the GitHub event before SHA instead of the already-updated default branch ref. What changed: - Resolve explicit, environment, and default branch comparisons through the merge base with HEAD. - Resolve GitHub push-event comparisons through the event before SHA when available. - Add deterministic report fields for base source and comparison mode. - Extend version-bump regression coverage for base-only changes, multi-commit branches, and push-event diffs. - Bump Signum plugin metadata and proofpack examples to 4.21.9. Testing: - python3 -m py_compile scripts/check_version_bump.py - bash tests/test-version-bump-required.sh - bash tests/test-ci-workflow.sh - bash tests/test-metadata-consistency.sh - bash tests/test-codex-plugin-metadata.sh - bash tests/test-proofpack-validation.sh - bash tests/test-signum-command-renderer.sh - bash tests/test-signum-fragment-parity.sh - bash tests/test-claude-overlay-doc-mirror.sh - git diff --check - PATH=/opt/homebrew/bin:/Users/vi/.codex/tmp/arg0/codex-arg0IyheAr:/opt/homebrew/opt/openjdk@17/libexec/openjdk.jdk/Contents/Home/bin:/Users/vi/Library/Android/sdk/platform-tools:/Users/vi/Library/Android/sdk/emulator:/Users/vi/.antigravity/antigravity/bin:/Users/vi/.agents/bin:/Users/vi/.opencode/bin:/Users/vi/.local/bin:/Users/vi/go/bin:/opt/homebrew/opt/libpq/bin:/Users/vi/.local/bin:/opt/homebrew/bin:/opt/homebrew/sbin:/usr/local/bin:/System/Cryptexes/App/usr/bin:/usr/bin:/bin:/usr/sbin:/sbin:/var/run/com.apple.security.cryptexd/codex.system/bootstrap/usr/local/bin:/var/run/com.apple.security.cryptexd/codex.system/bootstrap/usr/bin:/var/run/com.apple.security.cryptexd/codex.system/bootstrap/usr/appleinternal/bin:/opt/pkg/env/active/bin:/opt/pmk/env/global/bin:/Library/Apple/usr/bin:/usr/local/go/bin:/Users/vi/.local/bin:/Users/vi/.cargo/bin:/Users/vi/Library/Application Support/JetBrains/Toolbox/scripts:/Applications/Codex.app/Contents/Resources bash scripts/run-deterministic-tests.sh Not tested: - GitHub Actions push event execution was simulated with a local event JSON fixture, not run in GitHub Actions before this commit. Risk: - narrow - the guard now relies on merge-base availability for branch comparisons and skips when no usable base can be resolved. Signed-off-by: Vitaly D. <netmin@pm.me>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
beforeSHA for push comparisons.4.21.9.Issue ID
Test plan
python3 -m py_compile scripts/check_version_bump.pybash tests/test-version-bump-required.shbash tests/test-ci-workflow.shbash tests/test-metadata-consistency.shbash tests/test-codex-plugin-metadata.shbash tests/test-proofpack-validation.shbash tests/test-signum-command-renderer.shbash tests/test-signum-fragment-parity.shbash tests/test-claude-overlay-doc-mirror.shgit diff --checkPATH=/opt/homebrew/bin:$PATH bash scripts/run-deterministic-tests.shNotes