bazel-diff: Make auto diffbase work #1884
Merged
+7
−8
Conversation
This file contains 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
fweikert
approved these changes
Feb 21, 2024
fweikert
pushed a commit
to fweikert/continuous-integration
that referenced
this pull request
Mar 27, 2025
Fix the logic of resolving diffbase when `USE_BAZEL_DIFF` is one of `AUTO_DIFFBASE_VALUES`. - Reverted the change in bazelbuild#1883, since we do need to download the diffbase from the original repo instead of the PR repo. - First determine the base branch by checking BUILDKITE_PULL_REQUEST_BASE_BRANCH and then BUILDKITE_BRANCH - Fetch the base branch from the original repo - Run `git merge-base HEAD FETCH_HEAD` to calculate the diffbase commit.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fix the logic of resolving diffbase when
USE_BAZEL_DIFFis one ofAUTO_DIFFBASE_VALUES.git merge-base HEAD FETCH_HEADto calculate the diffbase commit.