diff --git a/.github/workflows/docker-action.yml b/.github/workflows/docker-action.yml index 22cbcc7..c5b6407 100644 --- a/.github/workflows/docker-action.yml +++ b/.github/workflows/docker-action.yml @@ -5,7 +5,7 @@ name: Docker CI on: push: branches: - - master + - v8.14 pull_request: branches: - '**' @@ -17,15 +17,16 @@ jobs: strategy: matrix: image: - - 'coqorg/coq:dev' + - 'coqorg/coq:8.14' fail-fast: false steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: coq-community/docker-coq-action@v1 with: opam_file: 'coq-atbr.opam' custom_image: ${{ matrix.image }} + # See also: # https://github.com/coq-community/docker-coq-action#readme # https://github.com/erikmd/docker-coq-github-action-demo diff --git a/README.md b/README.md index 98e6afc..f4ac93a 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ Follow the instructions on https://github.com/coq-community/templates to regener [![coqdoc][coqdoc-shield]][coqdoc-link] [![DOI][doi-shield]][doi-link] -[docker-action-shield]: https://github.com/coq-community/atbr/workflows/Docker%20CI/badge.svg?branch=master +[docker-action-shield]: https://github.com/coq-community/atbr/workflows/Docker%20CI/badge.svg?branch=v8.14 [docker-action-link]: https://github.com/coq-community/atbr/actions?query=workflow:"Docker%20CI" [contributing-shield]: https://img.shields.io/badge/contributions-welcome-%23f7931e.svg @@ -46,7 +46,7 @@ rather than automata: https://github.com/damien-pous/relation-algebra - Coq-community maintainer(s): - Tej Chajed ([**@tchajed**](https://github.com/tchajed)) - License: [GNU Lesser General Public License v3.0 or later](LICENSE) -- Compatible Coq versions: master (use the corresponding branch or release for other Coq versions) +- Compatible Coq versions: 8.14 (use the corresponding branch or release for other Coq versions) - Compatible OCaml versions: 4.05.0 or later - Additional dependencies: none - Coq namespace: `ATBR` diff --git a/coq-atbr.opam b/coq-atbr.opam index a073215..b220719 100644 --- a/coq-atbr.opam +++ b/coq-atbr.opam @@ -22,11 +22,11 @@ Note that the initial authors consider this library to be superseded by the Relation Algebra library, which is based on derivatives rather than automata: https://github.com/damien-pous/relation-algebra""" -build: [make "-j%{jobs}%" ] +build: [make "-j%{jobs}%"] install: [make "install"] depends: [ "ocaml" {>= "4.05.0"} - "coq" {= "dev"} + "coq" {>= "8.14" & < "8.15"} ] tags: [ diff --git a/default.nix b/default.nix deleted file mode 100644 index 45f0831..0000000 --- a/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ pkgs ? (import {}), coq-version-or-url, shell ? false }: - -let - coq-version-parts = builtins.match "([0-9]+).([0-9]+)" coq-version-or-url; - coqPackages = - if coq-version-parts == null then - pkgs.mkCoqPackages (import (fetchTarball coq-version-or-url) {}) - else - pkgs."coqPackages_${builtins.concatStringsSep "_" coq-version-parts}"; -in - -with coqPackages; - -pkgs.stdenv.mkDerivation { - - name = "atbr"; - - propagatedBuildInputs = [ - coq - ]; - - src = if shell then null else ./.; - - installFlags = "COQMF_COQLIB=$(out)/lib/coq/${coq.coq-version}/"; -} diff --git a/meta.yml b/meta.yml index b056990..43b66da 100644 --- a/meta.yml +++ b/meta.yml @@ -6,6 +6,8 @@ community: true action: true coqdoc: true doi: 10.2168/LMCS-8(1:16)2012 +branch: 'v8.14' +plugin: true synopsis: Coq library and tactic for deciding Kleene algebras @@ -43,18 +45,15 @@ license: identifier: LGPL-3.0-or-later supported_coq_versions: - text: master (use the corresponding branch or release for other Coq versions) - opam: '{= "dev"}' + text: 8.14 (use the corresponding branch or release for other Coq versions) + opam: '{>= "8.14" & < "8.15"}' supported_ocaml_versions: text: 4.05.0 or later opam: '{>= "4.05.0"}' -tested_coq_nix_versions: -- version_or_url: https://github.com/coq/coq-on-cachix/tarball/master - tested_coq_opam_versions: -- version: dev +- version: 8.14 namespace: ATBR