diff options
| -rw-r--r-- | .gitlab-ci.yml | 12 | ||||
| -rw-r--r-- | CONTRIBUTING.md | 10 | ||||
| -rwxr-xr-x | dev/bench/gitlab.sh | 5 | ||||
| -rw-r--r-- | dev/ci/docker/bionic_coq/Dockerfile | 4 | ||||
| -rw-r--r-- | test-suite/Makefile | 8 | ||||
| -rw-r--r-- | test-suite/unit-tests/.merlin.in | 2 |
6 files changed, 19 insertions, 22 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ed944366f1..ab06123aed 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -19,7 +19,7 @@ stages: variables: # Format: $IMAGE-V$DATE [Cache is not used as of today but kept here # for reference] - CACHEKEY: "bionic_coq-V2020-07-21-V38" + CACHEKEY: "bionic_coq-V2020-08-18-V29" IMAGE: "$CI_REGISTRY_IMAGE:$CACHEKEY" # By default, jobs run in the base switch; override to select another switch OPAM_SWITCH: "base" @@ -612,12 +612,6 @@ test-suite:edge:dune:dev: expire_in: 2 week allow_failure: true -test-suite:4.11+trunk+dune: - extends: .test-suite:ocaml+beta+dune-template - variables: - OCAMLVER: 4.11.0+trunk - -# Pending on https://github.com/ocaml/dune/pull/3585 # test-suite:4.12+trunk+dune: # extends: .test-suite:ocaml+beta+dune-template # variables: @@ -939,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" @@ -957,5 +950,6 @@ bench: name: "$CI_JOB_NAME" paths: - _bench/html/**/*.v.html + - _bench/logs when: always expire_in: 1 year diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index d561ec8a12..a96b93154c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -791,10 +791,12 @@ organization, because of a limitation of GitHub). #### Additional notes for pull request reviewers and assignees #### -- NEVER USE GITHUB'S MERGE BUTTON. Instead, we provide a script - [`dev/tools/merge-pr.sh`][merge-pr] which you should use to merge a - PR (requires having configured gpg with git). In the future, we - will also support merging through a command to **@coqbot**. +- NEVER USE GITHUB'S MERGE BUTTON. Instead, you should either: + - run the [`dev/tools/merge-pr.sh`][merge-pr] script (requires + having configured gpg with git); + - or post a comment containing "@coqbot: merge now" (this is + especially convenient for developers who do not have a GPG key and + for when you do not have access to a console). - PR authors or co-authors cannot review, self-assign, or merge the PR they contributed to. However, reviewers may push small fixes to the 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" diff --git a/test-suite/Makefile b/test-suite/Makefile index 5d4e15b985..758374c5de 100644 --- a/test-suite/Makefile +++ b/test-suite/Makefile @@ -300,20 +300,20 @@ endif unit-tests/src/utest.cmx: unit-tests/src/utest.ml unit-tests/src/utest.cmi $(SHOW) 'OCAMLOPT $<' - $(HIDE)$(OCAMLOPT) -c -I unit-tests/src -package oUnit $< + $(HIDE)$(OCAMLOPT) -c -I unit-tests/src -package ounit2 $< unit-tests/src/utest.cmo: unit-tests/src/utest.ml unit-tests/src/utest.cmi $(SHOW) 'OCAMLC $<' - $(HIDE)$(OCAMLC) -c -I unit-tests/src -package oUnit $< + $(HIDE)$(OCAMLC) -c -I unit-tests/src -package ounit2 $< unit-tests/src/utest.cmi: unit-tests/src/utest.mli $(SHOW) 'OCAMLC $<' - $(HIDE)$(OCAMLC) -package oUnit -c $< + $(HIDE)$(OCAMLC) -package ounit2 -c $< unit-tests: $(UNIT_LOGFILES) # Build executable, run it to generate log file unit-tests/%.ml.log: unit-tests/%.ml unit-tests/src/$(UNIT_LINK) $(SHOW) 'TEST $<' - $(HIDE)$(OCAMLBEST) -linkall -linkpkg -package coq.toplevel,oUnit \ + $(HIDE)$(OCAMLBEST) -linkall -linkpkg -package coq.toplevel,ounit2 \ -I unit-tests/src $(UNIT_LINK) $< -o $<.test; $(HIDE)./$<.test diff --git a/test-suite/unit-tests/.merlin.in b/test-suite/unit-tests/.merlin.in index b2279de74e..668b431d52 100644 --- a/test-suite/unit-tests/.merlin.in +++ b/test-suite/unit-tests/.merlin.in @@ -3,4 +3,4 @@ REC S ** B ** -PKG oUnit +PKG ounit2 |