diff options
| author | Pierre-Marie Pédrot | 2020-08-24 14:34:37 +0200 |
|---|---|---|
| committer | Pierre-Marie Pédrot | 2020-08-24 15:03:55 +0200 |
| commit | bcde3d1726a1ffee3d39ef22e1d12d86c2842ece (patch) | |
| tree | 0252bc5538a06a4bfee281e232b5ebd8078b7aa8 | |
| parent | f42b28ed0cfd200395a4a32fd1ebe6a7f73a7ddb (diff) | |
Perform a few tweaks to make the bench script work properly.
| -rw-r--r-- | .gitlab-ci.yml | 3 | ||||
| -rwxr-xr-x | dev/bench/gitlab.sh | 5 |
2 files changed, 4 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ed944366f1..3449d9547b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -939,14 +939,13 @@ bench: tags: - timing variables: + GIT_DEPTH: "" coq_pr_number: "" coq_pr_comment_id: "" new_ocaml_switch: "ocaml-base-compiler.4.07.1" old_ocaml_switch: "ocaml-base-compiler.4.07.1" new_coq_repository: "https://gitlab.com/coq/coq.git" old_coq_repository: "https://gitlab.com/coq/coq.git" - new_coq_commit: "$CI_COMMIT_SHA" - old_coq_commit: "master" new_coq_opam_archive_git_uri: "https://github.com/coq/opam-coq-archive.git" old_coq_opam_archive_git_uri: "https://github.com/coq/opam-coq-archive.git" new_coq_opam_archive_git_branch: "master" 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 |