From 8699ad5ade5bf3c4fad093026e596f892f4c6262 Mon Sep 17 00:00:00 2001 From: Ralf Jung <jung@mpi-sws.org> Date: Wed, 8 Dec 2021 10:47:21 -0500 Subject: [PATCH] test against Coq 8.15 branch --- .gitlab-ci.yml | 12 ++++++------ coq-iris.opam | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8d59d1e0d..46cc1194a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -41,10 +41,10 @@ variables: ## Build jobs -build-coq.dev: +build-coq.8.15.dev: <<: *template variables: - OPAM_PINS: "coq version dev" + OPAM_PINS: "coq version 8.15.dev" MANGLE_NAMES: "1" build-coq.8.14.1: @@ -84,23 +84,23 @@ build-coq.8.12.2: # Nightly job with a known-to-work Coq version # (so failures must be caused by std++) -trigger-stdpp.dev-coq.8.13.1: +trigger-stdpp.dev-coq.8.14.1: <<: *template variables: STDPP_REPO: "iris/stdpp" - OPAM_PINS: "coq version 8.13.1 git+https://gitlab.mpi-sws.org/$STDPP_REPO#$STDPP_REV" + OPAM_PINS: "coq version 8.14.1 git+https://gitlab.mpi-sws.org/$STDPP_REPO#$STDPP_REV" except: only: - triggers - schedules - api -# Nightly job with latest Coq beta branch +# Nightly job with latest Coq branch trigger-stdpp.dev-coq.8.14.dev: <<: *template variables: STDPP_REPO: "iris/stdpp" - OPAM_PINS: "coq version 8.14.dev git+https://gitlab.mpi-sws.org/$STDPP_REPO#$STDPP_REV" + OPAM_PINS: "coq version dev git+https://gitlab.mpi-sws.org/$STDPP_REPO#$STDPP_REV" CI_COQCHK: "1" except: only: diff --git a/coq-iris.opam b/coq-iris.opam index f26d83323..c6b6c48a0 100644 --- a/coq-iris.opam +++ b/coq-iris.opam @@ -27,8 +27,8 @@ tags: [ ] depends: [ - "coq" { (>= "8.12" & < "8.15~") | (= "dev") } - "coq-stdpp" { (= "dev.2021-12-07.1.a06988a9") | (= "dev") } + "coq" { (>= "8.12" & < "8.16~") | (= "dev") } + "coq-stdpp" { (= "dev.2021-12-08.0.130789ac") | (= "dev") } ] build: ["./make-package" "iris" "-j%{jobs}%"] -- GitLab