From 34276dc512d7cbd767026a543cbdaaa3b5cc3846 Mon Sep 17 00:00:00 2001 From: Karl Palmskog Date: Wed, 13 Jan 2021 13:10:58 +0100 Subject: [PATCH] restrict Coq versions, generate boilerplate --- .github/workflows/coq-ci.yml | 7 ++++--- README.md | 12 ++++++++---- coq-coq-art.opam | 5 ++++- meta.yml | 8 +++++--- 4 files changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/coq-ci.yml b/.github/workflows/coq-ci.yml index e78d6a7..7f65ace 100644 --- a/.github/workflows/coq-ci.yml +++ b/.github/workflows/coq-ci.yml @@ -1,4 +1,6 @@ -name: CI +# This file was generated from `meta.yml`, please do not edit manually. +# Follow the instructions on https://github.com/coq-community/templates to regenerate. +name: Docker CI on: push: @@ -15,9 +17,8 @@ jobs: strategy: matrix: image: + - 'coqorg/coq:8.13' - 'coqorg/coq:8.12' - - 'coqorg/coq:8.11' - - 'coqorg/coq:8.10' fail-fast: false steps: - uses: actions/checkout@v2 diff --git a/README.md b/README.md index 5ebcc25..b475b5a 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,17 @@ + # Coq'Art -[![CI][action-shield]][action-link] +[![Docker CI][docker-action-shield]][docker-action-link] [![Contributing][contributing-shield]][contributing-link] [![Code of Conduct][conduct-shield]][conduct-link] [![Zulip][zulip-shield]][zulip-link] [![DOI][doi-shield]][doi-link] -[action-shield]: https://github.com/coq-community/coq-art/workflows/CI/badge.svg?branch=master -[action-link]: https://github.com/coq-community/coq-art/actions?query=workflow%3ACI +[docker-action-shield]: https://github.com/coq-community/coq-art/workflows/Docker%20CI/badge.svg?branch=master +[docker-action-link]: https://github.com/coq-community/coq-art/actions?query=workflow:"Docker%20CI" [contributing-shield]: https://img.shields.io/badge/contributions-welcome-%23f7931e.svg [contributing-link]: https://github.com/coq-community/manifesto/blob/master/CONTRIBUTING.md @@ -86,4 +90,4 @@ The repository is structured as follows. [book-url]: http://www.labri.fr/perso/casteran/CoqArt/ [publisher-url]: https://www.springer.com/gp/book/9783540208549 -[community-url]: https://coq-community.org/coq-art/ \ No newline at end of file +[community-url]: https://coq-community.org/coq-art/ diff --git a/coq-coq-art.opam b/coq-coq-art.opam index 86d3414..40cb875 100644 --- a/coq-coq-art.opam +++ b/coq-coq-art.opam @@ -1,3 +1,6 @@ +# 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" @@ -17,7 +20,7 @@ out of over 200 exercises from the book.""" build: [make "-j%{jobs}%" ] install: [make "install"] depends: [ - "coq" {>= "8.10" & < "8.13~"} + "coq" {>= "8.12" & < "8.14~"} ] tags: [ diff --git a/meta.yml b/meta.yml index 25f2391..f5aecac 100644 --- a/meta.yml +++ b/meta.yml @@ -41,12 +41,11 @@ license: supported_coq_versions: text: 8.10 or later (use the corresponding release for other Coq versions) - opam: '{>= "8.10" & < "8.13~"}' + opam: '{>= "8.12" & < "8.14~"}' tested_coq_opam_versions: +- version: '8.13' - version: '8.12' -- version: '8.11' -- version: '8.10' namespace: coqart @@ -71,6 +70,8 @@ documentation: |- For more information, see the [book website][book-url] and the [publisher's website][publisher-url]. + This repository is also used as the source for the following [web site][community-url]. + The repository is structured as follows. ### Book chapters @@ -100,4 +101,5 @@ documentation: |- [book-url]: http://www.labri.fr/perso/casteran/CoqArt/ [publisher-url]: https://www.springer.com/gp/book/9783540208549 + [community-url]: https://coq-community.org/coq-art/ ---