From 8d2c505baef51189c55aeb15f723f606bfc376f2 Mon Sep 17 00:00:00 2001 From: Pierre Roux Date: Tue, 19 Dec 2023 10:32:58 +0100 Subject: [PATCH 1/2] chore: Adapt meta.yml to v8.20 & Add dedicated CI test using coqorg/base --- .github/workflows/docker-action.yml | 19 +++++++++++++------ README.md | 2 +- coq-bignums.opam | 7 +++++-- meta.yml | 8 ++++---- 4 files changed, 23 insertions(+), 13 deletions(-) diff --git a/.github/workflows/docker-action.yml b/.github/workflows/docker-action.yml index dc43cf0..a699396 100644 --- a/.github/workflows/docker-action.yml +++ b/.github/workflows/docker-action.yml @@ -7,7 +7,7 @@ on: # - cron: '0 4 * * *' push: branches: - - master + - v8.20 pull_request: branches: - '**' @@ -18,19 +18,26 @@ jobs: runs-on: ubuntu-latest strategy: matrix: + coq_version: + - '8.20.dev' image: - - 'coqorg/coq:dev' + # we can't use coqorg/coq images to test bignums + # since these images already include coq-bignums + - 'coqorg/base:4.13.1-flambda' fail-fast: false steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: coq-community/docker-coq-action@v1 with: opam_file: 'coq-bignums.opam' custom_image: ${{ matrix.image }} install: | - startGroup "Install dependencies" - # sudo apt-get update -y -q - opam remove -y coq-bignums # remove coq-bignums already in image + startGroup "Install coq and dependencies" + sudo apt-get update -y -q + opam remove -y coq-bignums || true # remove coq-bignums if ever in image + opam repository add --all-switches --set-default coq-extra-dev https://coq.inria.fr/opam/extra-dev # docker-coq + opam repository add --all-switches --set-default coq-core-dev https://coq.inria.fr/opam/core-dev # docker-coq + opam pin add -n -y -k version coq ${{ matrix.coq_version }} # docker-coq opam pin add -n -y -k path $PACKAGE $WORKDIR opam update -y opam install --confirm-level=unsafe-yes -j 2 $PACKAGE --deps-only diff --git a/README.md b/README.md index 5688d0c..4f23b9d 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ Follow the instructions on https://github.com/coq-community/templates to regener [![Code of Conduct][conduct-shield]][conduct-link] [![Zulip][zulip-shield]][zulip-link] -[docker-action-shield]: https://github.com/coq-community/bignums/actions/workflows/docker-action.yml/badge.svg?branch=master +[docker-action-shield]: https://github.com/coq-community/bignums/actions/workflows/docker-action.yml/badge.svg?branch=v8.20 [docker-action-link]: https://github.com/coq-community/bignums/actions/workflows/docker-action.yml [contributing-shield]: https://img.shields.io/badge/contributions-welcome-%23f7931e.svg diff --git a/coq-bignums.opam b/coq-bignums.opam index 16e28ce..c6339d9 100644 --- a/coq-bignums.opam +++ b/coq-bignums.opam @@ -1,6 +1,9 @@ +# This file was generated from `meta.yml`, please do not edit manually. +# Follow the instructions on https://github.com/coq-community/templates to regenerate. + opam-version: "2.0" maintainer: "palmskog@gmail.com" -version: "dev" +version: "8.20.dev" homepage: "https://github.com/coq-community/bignums" dev-repo: "git+https://github.com/coq-community/bignums.git" @@ -19,7 +22,7 @@ install: [ ] depends: [ "ocaml" - "coq" {= "dev"} + "coq" {>= "8.20" & < "8.21~"} ] tags: [ diff --git a/meta.yml b/meta.yml index daa00ca..1e71809 100644 --- a/meta.yml +++ b/meta.yml @@ -4,7 +4,7 @@ shortname: bignums organization: coq-community community: true action: true -branch: master +branch: v8.20 synopsis: >- Bignums, the Coq library of arbitrarily large numbers @@ -28,7 +28,7 @@ maintainers: opam-file-maintainer: palmskog@gmail.com -opam-file-version: dev +opam-file-version: 8.20.dev license: fullname: GNU Lesser General Public License v2.1 @@ -41,10 +41,10 @@ supported_ocaml_versions: supported_coq_versions: text: master (use the corresponding branch or release for other Coq versions) - opam: '{= "dev"}' + opam: '{>= "8.20" & < "8.21~"}' tested_coq_opam_versions: -- version: dev +- version: 8.20 ci_cron_schedule: '0 4 * * *' From 2f78cc174bbf6e66515f7bac1734645e23aaabdd Mon Sep 17 00:00:00 2001 From: Erik Martin-Dorel Date: Thu, 20 Jun 2024 00:10:41 +0200 Subject: [PATCH 2/2] fix: Add optional-but-useful version string during opam path pinning otherwise we get -> installed coq-bignums.8.20.dev --- .github/workflows/docker-action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-action.yml b/.github/workflows/docker-action.yml index a699396..efa22fb 100644 --- a/.github/workflows/docker-action.yml +++ b/.github/workflows/docker-action.yml @@ -38,7 +38,7 @@ jobs: opam repository add --all-switches --set-default coq-extra-dev https://coq.inria.fr/opam/extra-dev # docker-coq opam repository add --all-switches --set-default coq-core-dev https://coq.inria.fr/opam/core-dev # docker-coq opam pin add -n -y -k version coq ${{ matrix.coq_version }} # docker-coq - opam pin add -n -y -k path $PACKAGE $WORKDIR + opam pin add -n -y -k path $PACKAGE.dev $WORKDIR opam update -y opam install --confirm-level=unsafe-yes -j 2 $PACKAGE --deps-only endGroup