ci: fix build_openssl_presubmit() merge-base in shallow clones - #46463
Merged
jwendell merged 1 commit intoJul 30, 2026
Merged
Conversation
The CI checkout uses `fetch-depth: 1` for PRs, so both
`git merge-base` and the `HEAD~1` fallback fail silently —
resulting in no changed files detected and all tests skipped.
When `merge-base` fails, fall back to diffing against
`origin/${CI_TARGET_BRANCH}` directly, which compares trees
without needing history traversal.
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Signed-off-by: Jonh Wendell <jwendell@redhat.com>
phlax
approved these changes
Jul 30, 2026
phlax
left a comment
phlax
left a comment
Member
There was a problem hiding this comment.
i would probably skip the 2 fallbacks and just make sure its unshallowed
if [[ "$(git rev-parse --is-shallow-repository)" == "true" ]]; then
git fetch --unshallow
fi
both "last commit" and "diff from main" give wrong results in most cases
up to you tho
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
2 participants
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.
The CI checkout uses
fetch-depth: 1for PRs, so bothgit merge-baseand theHEAD~1fallback fail silently — resulting in no changed files detected and all tests skipped.When
merge-basefails, fall back to diffing againstorigin/${CI_TARGET_BRANCH}directly, which compares trees without needing history traversal.