openssf-scorecard: Use merge base as baseline instead of branch tip #10
+22
−10
Conversation
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
![gemini-code-assist[bot]](https://avatars.githubusercontent.com/in/956858?s=60&v=4){kind=small}
There was a problem hiding this comment.
Code Review
This pull request is a great improvement, correctly changing the baseline for Scorecard regression detection to use the merge base. This will make the check more reliable and prevent false failures. The logic is sound and the changes are well-documented. I have a couple of suggestions to improve robustness in an edge case and to fix the local testing instructions provided in the comments.
Previously the action used the base branch tip (github.event.pull_request.base.sha) as the baseline for regression detection. This caused false failures when the base branch improved after a PR was created - the PR would appear to regress even though it didn't change anything security-related. Now we compute the merge base between the base and head SHAs, which represents where the PR branched from the target branch. This ensures we're answering the right question: 'Did this PR introduce regressions?' rather than 'Is this PR as good as current main?' The merge base is stable and won't change when the base branch advances, so PRs will only fail if they actually introduce regressions, not because they're missing improvements that landed on main after the PR was created. Use head -n 1 to handle edge cases where git merge-base returns multiple SHAs (e.g., after criss-cross merges). Assisted-by: OpenCode (claude-sonnet-4-20250514) Signed-off-by: Colin Walters <walters@verbum.org>
cgwalters
force-pushed
the
fix-scorecard-merge-base
branch
from
718d39b to
22ad0e6
Compare
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.
Previously the action used the base branch tip (github.event.pull_request.base.sha) as the baseline for regression detection. This caused false failures when the base branch improved after a PR was created - the PR would appear to regress even though it didn't change anything security-related.
Now we compute the merge base between the base and head SHAs, which represents where the PR branched from the target branch. This ensures we're answering the right question: 'Did this PR introduce regressions?' rather than 'Is this PR as good as current main?'
The merge base is stable and won't change when the base branch advances, so PRs will only fail if they actually introduce regressions, not because they're missing improvements that landed on main after the PR was created.
Assisted-by: OpenCode (Claude Sonnet 4)