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 | |
| 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
| -rw-r--r-- | .gitlab-ci.yml | 4 | ||||
| -rwxr-xr-x | dev/bench/gitlab.sh | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 49608fd259..ab06123aed 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -933,14 +933,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" @@ -951,5 +950,6 @@ bench: name: "$CI_JOB_NAME" paths: - _bench/html/**/*.v.html + - _bench/logs when: always expire_in: 1 year 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 |