From 053be33a30ccf3bff700d7052bd236a26c08ba08 Mon Sep 17 00:00:00 2001 From: Eric <5846501+ericphanson@users.noreply.github.com> Date: Sun, 1 Sep 2019 01:13:41 +0100 Subject: [PATCH 1/2] Fix travis (thanks to @tkf) --- .travis.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 50ddaca1f..dac64667b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,11 +18,15 @@ jobs: - git fetch origin '+refs/heads/master:refs/remotes/origin/master' - git branch master origin/master # Run benchmark outside `script` so that it's hidden by default: - - julia --project=benchmark benchmark/runjudge.jl' + - julia --project=benchmark -e ' + using Pkg; Pkg.instantiate(); + include("benchmark/runjudge.jl");' + script: - - julia --project=benchmark benchmark/pprintjudge.jl' + - julia --project=benchmark -e ' + using Pkg; Pkg.instantiate(); + include("benchmark/pprintjudge.jl");' after_success: skip - if: NOT (branch = master) - stage: Documentation julia: 1.0 script: julia --project=docs -e ' From e440f45da0f3aa597b1cf1d6547c905a75623494 Mon Sep 17 00:00:00 2001 From: Eric <5846501+ericphanson@users.noreply.github.com> Date: Sun, 1 Sep 2019 01:37:28 +0100 Subject: [PATCH 2/2] Change baseline branch --- .travis.yml | 2 +- benchmark/runjudge.jl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index dac64667b..3e0b1a22c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,7 +16,7 @@ jobs: os: linux before_script: - git fetch origin '+refs/heads/master:refs/remotes/origin/master' - - git branch master origin/master + - git branch baseline origin/master # Run benchmark outside `script` so that it's hidden by default: - julia --project=benchmark -e ' using Pkg; Pkg.instantiate(); diff --git a/benchmark/runjudge.jl b/benchmark/runjudge.jl index 216a95565..c0b560322 100644 --- a/benchmark/runjudge.jl +++ b/benchmark/runjudge.jl @@ -18,7 +18,7 @@ group_target = benchmarkpkg( group_baseline = benchmarkpkg( dirname(@__DIR__), - mkconfig(id = "master"), + mkconfig(id = "baseline"), resultfile = joinpath(@__DIR__, "result-baseline.json"), )