From 1bb1a7b5d34a92d669d607264b5c0d7b2bc82443 Mon Sep 17 00:00:00 2001
From: Jarrett Revels <jarrettrevels@gmail.com>
Date: Tue, 2 May 2017 15:40:35 -0400
Subject: [PATCH] move BaseBenchmarks add/checkout logic to post-build step
 (#33)

---
 src/jobs/BenchmarkJob.jl | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/jobs/BenchmarkJob.jl b/src/jobs/BenchmarkJob.jl
index d7fcb9e..14a5925 100644
--- a/src/jobs/BenchmarkJob.jl
+++ b/src/jobs/BenchmarkJob.jl
@@ -168,18 +168,6 @@ function Base.run(job::BenchmarkJob)
     node = myid()
     cfg = submission(job).config
 
-    # update BaseBenchmarks for all supported Julia versions
-    nodelog(cfg, node, "updating local BaseBenchmarks repo")
-    branchname = cfg.testmode ? "test" : "nanosoldier"
-    oldpwd = pwd()
-    versiondirs = ("v0.4", "v0.5", "v0.6")
-    for v in versiondirs
-        cd(joinpath(homedir(), ".julia", v, "BaseBenchmarks"))
-        run(`git fetch --all --quiet`)
-        run(`git reset --hard --quiet origin/$(branchname)`)
-    end
-    cd(oldpwd)
-
     # make temporary directory for job results
     # Why not create the job's actual report directory now instead? The answer is that
     # the commit SHA that currently describes the job might change if we find out that
@@ -275,6 +263,16 @@ function execute_benchmarks!(job::BenchmarkJob, whichbuild::Symbol)
     # update local Julia packages for the relevant Julia version
     run(`$juliapath -e 'Pkg.update()'`)
 
+    # add/update BaseBenchmarks for the relevant Julia version + use branch specified by cfg
+    nodelog(cfg, node, "updating local BaseBenchmarks repo")
+    branchname = cfg.testmode ? "test" : "nanosoldier"
+    oldpwd = pwd()
+    run(`$juliapath -e 'Pkg.add("BaseBenchmarks")'`)
+    cd(readstring(`$juliapath -e 'print(Pkg.dir("BaseBenchmarks"))'`))
+    run(`git fetch --all --quiet`)
+    run(`git reset --hard --quiet origin/$(branchname)`)
+    cd(oldpwd)
+
     # The following code sets up a CPU shield, then spins up a new julia process on the
     # shielded CPU that runs the benchmarks. The results from this new process are
     # then serialized to a JLD file so that we can retrieve them.