diff options
| author | coqbot-app[bot] | 2020-08-25 11:20:49 +0000 |
|---|---|---|
| committer | GitHub | 2020-08-25 11:20:49 +0000 |
| commit | fe56ac4d5fd18794f65d03fe1110b00283b163b3 (patch) | |
| tree | c1dcc4dfa5535a1b53ce0ee9b542feda6fd61ed0 /dev | |
| parent | ba3ff67b1b680a7deb3fddacb7134d5e38228602 (diff) | |
| parent | 0b86f6e8a4b6c5da33471f32213795a42af39d1a (diff) | |
Merge PR #12882: Perform a few tweaks to make the bench script work properly.
Reviewed-by: SkySkimmer
Ack-by: ppedrot
Diffstat (limited to 'dev')
| -rwxr-xr-x | dev/bench/gitlab.sh | 5 |
1 files changed, 3 insertions, 2 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 |