Skip to content

Commit

Permalink
remove Dune requirement for now, add CI for MathComp 1.12 (#23)
Browse files Browse the repository at this point in the history
  • Loading branch information
palmskog authored Nov 27, 2020
1 parent 6bf3f01 commit 8dc9983
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 9 deletions.
1 change: 1 addition & 0 deletions .github/workflows/coq-action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ jobs:
matrix:
image:
- 'mathcomp/mathcomp-dev:coq-dev'
- 'mathcomp/mathcomp:1.12.0-coq-8.12'
- 'mathcomp/mathcomp:1.11.0-coq-8.12'
- 'mathcomp/mathcomp:1.10.0-coq-8.11'
- 'mathcomp/mathcomp:1.9.0-coq-8.10'
Expand Down
5 changes: 2 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ decidability results and closure properties of regular languages.
- Compatible Coq versions: 8.10 or later (use releases for other Coq versions)
- Additional dependencies:
- [MathComp](https://math-comp.github.io) 1.9.0 or later (`ssreflect` suffices)
- [Dune](https://dune.build) 2.5 or later
- Coq namespace: `RegLang`
- Related publication(s):
- [Regular Language Representations in the Constructive Type Theory of Coq](https://hal.archives-ouvertes.fr/hal-01832031/document) doi:[10.1007/s10817-018-9460-x](https://doi.org/10.1007/s10817-018-9460-x)
Expand All @@ -64,8 +63,8 @@ To instead build and install manually, do:
``` shell
git clone https://github.com/coq-community/reglang.git
cd reglang
dune build
dune install
make # or make -j <number-of-cores-on-your-machine>
make install
```


Expand Down
6 changes: 3 additions & 3 deletions coq-reglang.opam
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ automata (deterministic, nondeterministic, one-way, two-way),
regular expressions, and the logic WS1S. It also contains various
decidability results and closure properties of regular languages."""

build: ["dune" "build" "-p" name "-j" jobs]
build: [make "-j%{jobs}%" ]
install: [make "install"]
depends: [
"dune" {>= "2.5"}
"coq" {(>= "8.10" & < "8.13~") | (= "dev")}
"coq-mathcomp-ssreflect" {(>= "1.9" & < "1.12~") | (= "dev")}
"coq-mathcomp-ssreflect" {(>= "1.9" & < "1.13~") | (= "dev")}
]

tags: [
Expand Down
7 changes: 4 additions & 3 deletions meta.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ organization: coq-community
community: true
action: true
coqdoc: true
dune: false
doi: 10.1007/s10817-018-9460-x

synopsis: >-
Expand Down Expand Up @@ -41,8 +42,6 @@ opam-file-maintainer: palmskog@gmail.com

opam-file-version: dev

dune: true

license:
fullname: CeCILL-B
identifier: CECILL-B
Expand All @@ -54,7 +53,7 @@ supported_coq_versions:
dependencies:
- opam:
name: coq-mathcomp-ssreflect
version: '{(>= "1.9" & < "1.12~") | (= "dev")}'
version: '{(>= "1.9" & < "1.13~") | (= "dev")}'
nix: ssreflect
description: |-
[MathComp](https://math-comp.github.io) 1.9.0 or later (`ssreflect` suffices)
Expand All @@ -65,6 +64,8 @@ tested_coq_nix_versions:
tested_coq_opam_versions:
- version: 'coq-dev'
repo: 'mathcomp/mathcomp-dev'
- version: '1.12.0-coq-8.12'
repo: 'mathcomp/mathcomp'
- version: '1.11.0-coq-8.12'
repo: 'mathcomp/mathcomp'
- version: '1.10.0-coq-8.11'
Expand Down

0 comments on commit 8dc9983

Please sign in to comment.