Calculate the merge-base against the appropriate branch.

JuliaCI · Feb 26, 2024 · 38a4282 · 38a4282
1 parent c50635c
commit 38a4282
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/jobs/BenchmarkJob.jl b/src/jobs/BenchmarkJob.jl
@@ -88,8 +88,10 @@ function BenchmarkJob(submission::JobSubmission)
         against = againstbuild
     elseif submission.prnumber !== nothing
         # if there is a PR number, we compare against the base branch
+        pr_details = GitHub.pull_request(submission.repo, submission.prnumber; auth=submission.config.auth)
+        base_branch = pr_details.base.ref
         merge_base = GitHub.compare(submission.repo,
-                                    "master", "refs/pull/$(submission.prnumber)/head";
+                                    base_branch, "refs/pull/$(submission.prnumber)/head";
                                     auth=submission.config.auth).merge_base_commit
         against = commitref(submission.config, submission.repo, merge_base.sha)
     else

diff --git a/src/jobs/PkgEvalJob.jl b/src/jobs/PkgEvalJob.jl
@@ -158,8 +158,10 @@ function PkgEvalJob(submission::JobSubmission)
     elseif submission.prnumber !== nothing
         # if there is a PR number, we compare against the base branch.
         # this does not apply to packages, where we compare against the latest release.
+        pr_details = GitHub.pull_request(submission.repo, submission.prnumber; auth=submission.config.auth)
+        base_branch = pr_details.base.ref
         merge_base = GitHub.compare(submission.repo,
-                                    "master", "refs/pull/$(submission.prnumber)/head";
+                                    base_branch, "refs/pull/$(submission.prnumber)/head";
                                     auth=submission.config.auth).merge_base_commit
         against = commitref(submission.config, submission.repo, merge_base.sha)
     else