bazel-diff: Make auto diffbase work (#1884)
Fix the logic of resolving diffbase when `USE_BAZEL_DIFF` is one of
`AUTO_DIFFBASE_VALUES`.
- Reverted the change in
https://github.com/bazelbuild/continuous-integration/pull/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.
diff --git a/buildkite/bazelci.py b/buildkite/bazelci.py
index 57e67f3..5c3fe61 100755
--- a/buildkite/bazelci.py
+++ b/buildkite/bazelci.py
@@ -2433,7 +2433,12 @@
def resolve_diffbase(diffbase):
if diffbase in AUTO_DIFFBASE_VALUES:
- return resolve_revision("HEAD^")
+ base_branch = os.getenv("BUILDKITE_PULL_REQUEST_BASE_BRANCH", "")
+ # Fallback to the default branch for this repository if BUILDKITE_PULL_REQUEST_BASE_BRANCH is not set.
+ if not base_branch:
+ base_branch = os.getenv("BUILDKITE_BRANCH", "")
+ execute_command(["git", "fetch", "origin", base_branch])
+ return execute_command_and_get_output(["git", "merge-base", "HEAD", 'FETCH_HEAD']).decode("utf-8").strip()
elif COMMIT_RE.fullmatch(diffbase):
return diffbase
@@ -2445,13 +2450,7 @@
def get_commit_archive_url(resolved_diffbase):
- # If this is a GitHub pull request presubmit
- repo_url = os.getenv("BUILDKITE_PULL_REQUEST_REPO", "")
-
- # If this is a Google presubmit, BUILDKITE_PULL_REQUEST_REPO is not set, fallback to BUILDKITE_REPO
- if not repo_url:
- repo_url = os.getenv("BUILDKITE_REPO", "")
-
+ repo_url = os.getenv("BUILDKITE_REPO", "")
prefix = "+" if "googlesource" in repo_url else ""
return repo_url.replace(".git", "/{}archive/{}.tar.gz".format(prefix, resolved_diffbase))
