From 57b46dca7d3503e4615b6164a2f5e1245414d55f Mon Sep 17 00:00:00 2001 From: Kazuhiko Sakaguchi Date: Thu, 28 Mar 2024 16:14:31 +0100 Subject: [PATCH] Update CI --- .github/workflows/docker-action.yml | 5 +++++ README.md | 4 ++-- coq-fourcolor.opam | 4 ++-- meta.yml | 14 ++++++++++++-- 4 files changed, 21 insertions(+), 6 deletions(-) diff --git a/.github/workflows/docker-action.yml b/.github/workflows/docker-action.yml index 2bb498a..d2a09b6 100644 --- a/.github/workflows/docker-action.yml +++ b/.github/workflows/docker-action.yml @@ -23,6 +23,11 @@ jobs: - 'mathcomp/mathcomp:2.0.0-coq-8.18' - 'mathcomp/mathcomp:2.1.0-coq-8.16' - 'mathcomp/mathcomp:2.1.0-coq-8.18' + - 'mathcomp/mathcomp:2.2.0-coq-8.16' + - 'mathcomp/mathcomp:2.2.0-coq-8.19' + - 'mathcomp/mathcomp:2.2.0-coq-dev' + - 'mathcomp/mathcomp-dev:coq-8.17' + - 'mathcomp/mathcomp-dev:coq-8.19' - 'mathcomp/mathcomp-dev:coq-dev' fail-fast: false steps: diff --git a/README.md b/README.md index 998b537..96a426f 100644 --- a/README.md +++ b/README.md @@ -9,8 +9,8 @@ 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/fourcolor/workflows/Docker%20CI/badge.svg?branch=master -[docker-action-link]: https://github.com/coq-community/fourcolor/actions?query=workflow:"Docker%20CI" +[docker-action-shield]: https://github.com/coq-community/fourcolor/actions/workflows/docker-action.yml/badge.svg?branch=master +[docker-action-link]: https://github.com/coq-community/fourcolor/actions/workflows/docker-action.yml [contributing-shield]: https://img.shields.io/badge/contributions-welcome-%23f7931e.svg [contributing-link]: https://github.com/coq-community/manifesto/blob/master/CONTRIBUTING.md diff --git a/coq-fourcolor.opam b/coq-fourcolor.opam index 350b024..a65cefe 100644 --- a/coq-fourcolor.opam +++ b/coq-fourcolor.opam @@ -20,8 +20,8 @@ basic plane topology definitions, and a theory of combinatorial hypermaps.""" build: [make "-j%{jobs}%"] install: [make "install"] depends: [ - "coq" {(>= "8.16" & < "8.19~") | (= "dev")} - "coq-mathcomp-ssreflect" {(>= "2.0.0" & < "2.2~") | (= "dev")} + "coq" {(>= "8.16" & < "8.20~") | (= "dev")} + "coq-mathcomp-ssreflect" {(>= "2.0.0" & < "2.3~") | (= "dev")} "coq-mathcomp-algebra" ] diff --git a/meta.yml b/meta.yml index e6a4484..0341cfb 100644 --- a/meta.yml +++ b/meta.yml @@ -35,7 +35,7 @@ license: supported_coq_versions: text: 8.16 or later - opam: '{(>= "8.16" & < "8.19~") | (= "dev")}' + opam: '{(>= "8.16" & < "8.20~") | (= "dev")}' tested_coq_opam_versions: - version: '2.0.0-coq-8.16' @@ -46,6 +46,16 @@ tested_coq_opam_versions: repo: 'mathcomp/mathcomp' - version: '2.1.0-coq-8.18' repo: 'mathcomp/mathcomp' +- version: '2.2.0-coq-8.16' + repo: 'mathcomp/mathcomp' +- version: '2.2.0-coq-8.19' + repo: 'mathcomp/mathcomp' +- version: '2.2.0-coq-dev' + repo: 'mathcomp/mathcomp' +- version: 'coq-8.17' + repo: 'mathcomp/mathcomp-dev' +- version: 'coq-8.19' + repo: 'mathcomp/mathcomp-dev' - version: 'coq-dev' repo: 'mathcomp/mathcomp-dev' @@ -56,7 +66,7 @@ ci_cron_schedule: '0 5 * * *' dependencies: - opam: name: coq-mathcomp-ssreflect - version: '{(>= "2.0.0" & < "2.2~") | (= "dev")}' + version: '{(>= "2.0.0" & < "2.3~") | (= "dev")}' description: |- [MathComp ssreflect 2.0 or later](https://math-comp.github.io) - opam: