Use the GitHub API to query the merge-base.

Author: maleadt

Manifest.toml

@@ -173,9 +173,9 @@ version = "1.2.1"
 
 [[deps.GitHub]]
 deps = ["Base64", "Dates", "HTTP", "JSON", "MbedTLS", "Sockets", "SodiumSeal", "URIs"]
-git-tree-sha1 = "86e4a22eb548b5dea5a16eab388b4921020c0b8c"
+git-tree-sha1 = "08ee34cdc529bd4e631f661595c2eb695515bdbc"
 uuid = "bc5e4493-9b4d-5f90-b8aa-2b2bcaad7a26"
-version = "5.8.0"
+version = "5.8.1"
 
 [[deps.Git_jll]]
 deps = ["Artifacts", "Expat_jll", "Gettext_jll", "JLLWrappers", "LibCURL_jll", "Libdl", "Libiconv_jll", "OpenSSL_jll", "PCRE2_jll", "Pkg", "Zlib_jll"]

src/jobs/BenchmarkJob.jl

@@ -72,15 +72,10 @@ function BenchmarkJob(submission::JobSubmission)
         against = againstbuild
     elseif submission.prnumber !== nothing
         # if there is a PR number, we compare against the base branch
-        repo = joinpath(workdir, "julia")
-        if isdir(joinpath(repo, ".git"))
-            gitreset!(repo)
-        else
-            gitclone!(submission.config.trackrepo, repo)
-        end
-        run(`$(git()) -C $repo fetch --quiet origin +refs/pull/$(submission.prnumber)/head:`)
-        merge_base = chomp(read(`$(git()) -C $repo merge-base origin/master FETCH_HEAD`, String))
-        against = commitref(submission.config, submission.config.trackrepo, merge_base)
+        merge_base = GitHub.compare(submission.config.trackrepo,
+                                    "master", "refs/pull/$(submission.prnumber)/head";
+                                    auth=config.auth).merge_base_commit
+        against = commitref(submission.config, submission.config.trackrepo, merge_base.sha)
     else
         against = nothing
     end

src/jobs/PkgEvalJob.jl

@@ -112,15 +112,10 @@ function PkgEvalJob(submission::JobSubmission)
         against = againstbuild
     elseif submission.prnumber !== nothing
         # if there is a PR number, we compare against the base branch
-        repo = joinpath(workdir, "julia")
-        if isdir(joinpath(repo, ".git"))
-            gitreset!(repo)
-        else
-            gitclone!(submission.config.trackrepo, repo)
-        end
-        run(`$(git()) -C $repo fetch --quiet origin +refs/pull/$(submission.prnumber)/head:`)
-        merge_base = chomp(read(`$(git()) -C $repo merge-base origin/master FETCH_HEAD`, String))
-        against = commitref(submission.config, submission.config.trackrepo, merge_base)
+        merge_base = GitHub.compare(submission.config.trackrepo,
+                                    "master", "refs/pull/$(submission.prnumber)/head";
+                                    auth=config.auth).merge_base_commit
+        against = commitref(submission.config, submission.config.trackrepo, merge_base.sha)
     else
         against = nothing
     end