From c2d27540a592182a2611985f1bad7977e471f855 Mon Sep 17 00:00:00 2001 From: Yannick Forster Date: Mon, 2 Oct 2023 15:15:11 +0200 Subject: [PATCH] adapt CI and opam files to 8.18 --- .github/workflows/build.yml | 3 ++- coq-metacoq-common.opam | 2 +- coq-metacoq-erasure-plugin.opam | 2 +- coq-metacoq-erasure.opam | 2 +- coq-metacoq-pcuic.opam | 2 +- coq-metacoq-quotation.opam | 2 +- coq-metacoq-safechecker-plugin.opam | 2 +- coq-metacoq-safechecker.opam | 2 +- coq-metacoq-template-pcuic.opam | 2 +- coq-metacoq-template.opam | 2 +- coq-metacoq-translations.opam | 2 +- coq-metacoq-utils.opam | 6 +++--- coq-metacoq.opam | 2 +- 13 files changed, 16 insertions(+), 15 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0077acc3b..835fbadb1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -24,7 +24,7 @@ jobs: strategy: matrix: coq_version: - - 'dev' + - '8.18' ocaml_version: - '4.14-flambda' target: [ local, opam, quick ] @@ -50,6 +50,7 @@ jobs: startGroup "Workaround permission issue" sudo chown -R coq:coq . # <-- opam exec -- ocamlfind list + opam pin coq-equations.1.3 "https://github.com/mattam82/Coq-Equations.git#8.18" endGroup before_install: | startGroup "Print opam config" diff --git a/coq-metacoq-common.opam b/coq-metacoq-common.opam index 45a73ba75..cd4ae3fc6 100644 --- a/coq-metacoq-common.opam +++ b/coq-metacoq-common.opam @@ -1,5 +1,5 @@ opam-version: "2.0" -version: "dev" +version: "8.18.dev" maintainer: "matthieu.sozeau@inria.fr" homepage: "https://metacoq.github.io/metacoq" dev-repo: "git+https://github.com/MetaCoq/metacoq.git#main" diff --git a/coq-metacoq-erasure-plugin.opam b/coq-metacoq-erasure-plugin.opam index 884d6a877..c480c7e98 100644 --- a/coq-metacoq-erasure-plugin.opam +++ b/coq-metacoq-erasure-plugin.opam @@ -1,5 +1,5 @@ opam-version: "2.0" -version: "dev" +version: "8.18.dev" maintainer: "matthieu.sozeau@inria.fr" homepage: "https://metacoq.github.io/metacoq" dev-repo: "git+https://github.com/MetaCoq/metacoq.git#main" diff --git a/coq-metacoq-erasure.opam b/coq-metacoq-erasure.opam index b2dd484f9..0eecc5523 100644 --- a/coq-metacoq-erasure.opam +++ b/coq-metacoq-erasure.opam @@ -1,5 +1,5 @@ opam-version: "2.0" -version: "dev" +version: "8.18.dev" maintainer: "matthieu.sozeau@inria.fr" homepage: "https://metacoq.github.io/metacoq" dev-repo: "git+https://github.com/MetaCoq/metacoq.git#main" diff --git a/coq-metacoq-pcuic.opam b/coq-metacoq-pcuic.opam index f8abf0db5..87791e67c 100644 --- a/coq-metacoq-pcuic.opam +++ b/coq-metacoq-pcuic.opam @@ -1,5 +1,5 @@ opam-version: "2.0" -version: "dev" +version: "8.18.dev" maintainer: "matthieu.sozeau@inria.fr" homepage: "https://metacoq.github.io/metacoq" dev-repo: "git+https://github.com/MetaCoq/metacoq.git#main" diff --git a/coq-metacoq-quotation.opam b/coq-metacoq-quotation.opam index 59f5f9d3b..d36813915 100644 --- a/coq-metacoq-quotation.opam +++ b/coq-metacoq-quotation.opam @@ -1,5 +1,5 @@ opam-version: "2.0" -version: "dev" +version: "8.18.dev" maintainer: "matthieu.sozeau@inria.fr" homepage: "https://metacoq.github.io/metacoq" dev-repo: "git+https://github.com/MetaCoq/metacoq.git#main" diff --git a/coq-metacoq-safechecker-plugin.opam b/coq-metacoq-safechecker-plugin.opam index c691fdba0..10825a6a3 100644 --- a/coq-metacoq-safechecker-plugin.opam +++ b/coq-metacoq-safechecker-plugin.opam @@ -1,5 +1,5 @@ opam-version: "2.0" -version: "dev" +version: "8.18.dev" maintainer: "matthieu.sozeau@inria.fr" homepage: "https://metacoq.github.io/metacoq" dev-repo: "git+https://github.com/MetaCoq/metacoq.git#main" diff --git a/coq-metacoq-safechecker.opam b/coq-metacoq-safechecker.opam index 7594e7991..4ec7b94bc 100644 --- a/coq-metacoq-safechecker.opam +++ b/coq-metacoq-safechecker.opam @@ -1,5 +1,5 @@ opam-version: "2.0" -version: "dev" +version: "8.18.dev" maintainer: "matthieu.sozeau@inria.fr" homepage: "https://metacoq.github.io/metacoq" dev-repo: "git+https://github.com/MetaCoq/metacoq.git#main" diff --git a/coq-metacoq-template-pcuic.opam b/coq-metacoq-template-pcuic.opam index 1a0848d0c..18aa8302c 100644 --- a/coq-metacoq-template-pcuic.opam +++ b/coq-metacoq-template-pcuic.opam @@ -1,5 +1,5 @@ opam-version: "2.0" -version: "dev" +version: "8.18.dev" maintainer: "matthieu.sozeau@inria.fr" homepage: "https://metacoq.github.io/metacoq" dev-repo: "git+https://github.com/MetaCoq/metacoq.git#main" diff --git a/coq-metacoq-template.opam b/coq-metacoq-template.opam index 8d0ff8ed7..a6ac991a0 100644 --- a/coq-metacoq-template.opam +++ b/coq-metacoq-template.opam @@ -1,5 +1,5 @@ opam-version: "2.0" -version: "dev" +version: "8.18.dev" maintainer: "matthieu.sozeau@inria.fr" homepage: "https://metacoq.github.io/metacoq" dev-repo: "git+https://github.com/MetaCoq/metacoq.git#main" diff --git a/coq-metacoq-translations.opam b/coq-metacoq-translations.opam index 5db167651..409ce2ee3 100644 --- a/coq-metacoq-translations.opam +++ b/coq-metacoq-translations.opam @@ -1,5 +1,5 @@ opam-version: "2.0" -version: "dev" +version: "8.18.dev" maintainer: "matthieu.sozeau@inria.fr" homepage: "https://metacoq.github.io/metacoq" dev-repo: "git+https://github.com/MetaCoq/metacoq.git#main" diff --git a/coq-metacoq-utils.opam b/coq-metacoq-utils.opam index 497c11b53..680c1ded6 100644 --- a/coq-metacoq-utils.opam +++ b/coq-metacoq-utils.opam @@ -1,5 +1,5 @@ opam-version: "2.0" -version: "dev" +version: "8.18.dev" maintainer: "matthieu.sozeau@inria.fr" homepage: "https://metacoq.github.io/metacoq" dev-repo: "git+https://github.com/MetaCoq/metacoq.git#main" @@ -29,8 +29,8 @@ install: [ ] depends: [ "stdlib-shims" - "coq" { = "dev" } - "coq-equations" { = "dev" } + "coq" { >= "8.18" & < "8.19~" } + "coq-equations" { = "1.3" } ] synopsis: "The utility library of Template Coq and PCUIC" description: """ diff --git a/coq-metacoq.opam b/coq-metacoq.opam index 0e36fb32c..0995857c4 100644 --- a/coq-metacoq.opam +++ b/coq-metacoq.opam @@ -1,5 +1,5 @@ opam-version: "2.0" -version: "dev" +version: "8.18.dev" maintainer: "matthieu.sozeau@inria.fr" homepage: "https://metacoq.github.io/metacoq" dev-repo: "git+https://github.com/MetaCoq/metacoq.git#main"