diff options
Diffstat (limited to 'dev')
| -rwxr-xr-x | dev/bench/gitlab.sh | 5 | ||||
| -rw-r--r-- | dev/ci/docker/bionic_coq/Dockerfile | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/dev/bench/gitlab.sh b/dev/bench/gitlab.sh index 5423f30aba..15f5c01ac6 100755 --- a/dev/bench/gitlab.sh +++ b/dev/bench/gitlab.sh @@ -40,17 +40,18 @@ check_variable "coq_pr_number" check_variable "coq_pr_comment_id" check_variable "new_ocaml_switch" check_variable "new_coq_repository" -check_variable "new_coq_commit" check_variable "new_coq_opam_archive_git_uri" check_variable "new_coq_opam_archive_git_branch" check_variable "old_ocaml_switch" check_variable "old_coq_repository" -old_coq_commit="609152467f4d717713b7ea700f5155fc9f341cd7" check_variable "old_coq_opam_archive_git_uri" check_variable "old_coq_opam_archive_git_branch" check_variable "num_of_iterations" check_variable "coq_opam_packages" +new_coq_commit=$(git rev-parse HEAD^2) +old_coq_commit=$(git merge-base HEAD^1 $new_coq_commit) + if which jq > /dev/null; then : else diff --git a/dev/ci/docker/bionic_coq/Dockerfile b/dev/ci/docker/bionic_coq/Dockerfile index 7570b17095..67a8415891 100644 --- a/dev/ci/docker/bionic_coq/Dockerfile +++ b/dev/ci/docker/bionic_coq/Dockerfile @@ -1,4 +1,4 @@ -# CACHEKEY: "bionic_coq-V2020-07-21-V38" +# CACHEKEY: "bionic_coq-V2020-08-18-V29" # ^^ Update when modifying this file. FROM ubuntu:bionic @@ -38,7 +38,7 @@ ENV COMPILER="4.05.0" # Common OPAM packages. # `num` does not have a version number as the right version to install varies # with the compiler version. -ENV BASE_OPAM="num ocamlfind.1.8.1 ounit.2.2.2 odoc.1.5.0" \ +ENV BASE_OPAM="num ocamlfind.1.8.1 ounit2.2.2.3 odoc.1.5.0" \ CI_OPAM="menhir.20190626 ocamlgraph.1.8.8" \ BASE_ONLY_OPAM="elpi.1.11.0" |