diff --git a/.github/workflows/docker-action.yml b/.github/workflows/docker-action.yml index 44bd96f..90c8460 100644 --- a/.github/workflows/docker-action.yml +++ b/.github/workflows/docker-action.yml @@ -18,6 +18,7 @@ jobs: matrix: image: - 'coqorg/coq:dev' + - 'coqorg/coq:8.17' - 'coqorg/coq:8.16' - 'coqorg/coq:8.15' - 'coqorg/coq:8.14' @@ -26,7 +27,7 @@ jobs: - 'coqorg/coq:8.11' fail-fast: false steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: coq-community/docker-coq-action@v1 with: opam_file: 'coq-math-classes.opam' @@ -37,6 +38,7 @@ jobs: opam config list; opam repo list; opam list endGroup + # See also: # https://github.com/coq-community/docker-coq-action#readme # https://github.com/erikmd/docker-coq-github-action-demo diff --git a/coq-math-classes.opam b/coq-math-classes.opam index c627b25..008c822 100644 --- a/coq-math-classes.opam +++ b/coq-math-classes.opam @@ -30,7 +30,7 @@ build: [ ] install: [make "install"] depends: [ - "coq" {(>= "8.11" & < "8.17~") | (= "dev")} + "coq" {(>= "8.11" & < "8.18~") | (= "dev")} "coq-bignums" ] diff --git a/default.nix b/default.nix deleted file mode 100644 index aa51907..0000000 --- a/default.nix +++ /dev/null @@ -1,26 +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 = "math-classes"; - - propagatedBuildInputs = [ - coq - bignums - ]; - - src = if shell then null else ./.; - - installFlags = "COQMF_COQLIB=$(out)/lib/coq/${coq.coq-version}/"; -} diff --git a/meta.yml b/meta.yml index 4178bd6..ff2c729 100644 --- a/meta.yml +++ b/meta.yml @@ -50,10 +50,11 @@ license: supported_coq_versions: text: Coq 8.11 or later (use releases for other Coq versions) - opam: '{(>= "8.11" & < "8.17~") | (= "dev")}' + opam: '{(>= "8.11" & < "8.18~") | (= "dev")}' tested_coq_opam_versions: - version: dev +- version: "8.17" - version: "8.16" - version: "8.15" - version: "8.14"