Skip to content

Commit df89c4a

Browse files
authored
Merge pull request #17 from DistributedComponents/refresh-boilerplate
refresh boilerplate and CI and bump Dune to 3.5 or later
2 parents 88dc154 + 3abd08c commit df89c4a

8 files changed

+25
-19
lines changed

.github/workflows/docker-action.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,18 @@ jobs:
1515
strategy:
1616
matrix:
1717
image:
18-
- 'mathcomp/mathcomp-dev:coq-dev'
19-
- 'mathcomp/mathcomp:1.15.0-coq-8.16'
18+
- 'mathcomp/mathcomp:1.19.0-coq-8.19'
19+
- 'mathcomp/mathcomp:1.18.0-coq-8.18'
20+
- 'mathcomp/mathcomp:1.17.0-coq-8.17'
21+
- 'mathcomp/mathcomp:1.17.0-coq-8.16'
2022
- 'mathcomp/mathcomp:1.15.0-coq-8.15'
2123
- 'mathcomp/mathcomp:1.14.0-coq-8.15'
2224
- 'mathcomp/mathcomp:1.14.0-coq-8.14'
2325
- 'mathcomp/mathcomp:1.13.0-coq-8.15'
2426
- 'mathcomp/mathcomp:1.13.0-coq-8.14'
2527
fail-fast: false
2628
steps:
27-
- uses: actions/checkout@v3
29+
- uses: actions/checkout@v4
2830
- uses: coq-community/docker-coq-action@v1
2931
with:
3032
custom_image: ${{ matrix.image }}

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ Follow the instructions on https://github.com/coq-community/templates to regener
66

77
[![Docker CI][docker-action-shield]][docker-action-link]
88

9-
[docker-action-shield]: https://github.com/DistributedComponents/disel/workflows/Docker%20CI/badge.svg?branch=master
10-
[docker-action-link]: https://github.com/DistributedComponents/disel/actions?query=workflow:"Docker%20CI"
9+
[docker-action-shield]: https://github.com/DistributedComponents/disel/actions/workflows/docker-action.yml/badge.svg?branch=master
10+
[docker-action-link]: https://github.com/DistributedComponents/disel/actions/workflows/docker-action.yml
1111

1212

1313

@@ -28,7 +28,7 @@ from implementation details.
2828
- License: [BSD 2-Clause "Simplified" license](LICENSE)
2929
- Compatible Coq versions: 8.14 or later
3030
- Additional dependencies:
31-
- [MathComp](https://math-comp.github.io) 1.13.0 or later (`ssreflect` suffices)
31+
- [MathComp](https://math-comp.github.io) 1.13.0 to 1.19.0 (`ssreflect` suffices)
3232
- [FCSL PCM](https://github.com/imdea-software/fcsl-pcm) 1.7.0 or later
3333
- [Hoare Type Theory](https://github.com/imdea-software/htt) 1.2.0 or later
3434
- Coq namespace: `DiSeL`

coq-disel-calculator.opam

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ build: [make "-j%{jobs}%" "calculator"]
1212
depends: [
1313
"ocaml" {>= "4.05.0"}
1414
"coq" {>= "8.14"}
15-
"coq-mathcomp-ssreflect" {>= "1.13"}
15+
"coq-mathcomp-ssreflect" {>= "1.13" & < "2.0"}
1616
"coq-fcsl-pcm" {>= "1.7.0"}
1717
"coq-htt" {>= "1.2.0"}
1818
"ocamlbuild" {build}

coq-disel-examples.opam

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ synopsis: "Example systems for Disel, a separation-style logic for compositional
1010

1111
build: ["dune" "build" "-p" name "-j" jobs]
1212
depends: [
13-
"dune" {>= "2.5"}
13+
"dune" {>= "3.5"}
1414
"coq" {>= "8.14"}
15-
"coq-mathcomp-ssreflect" {>= "1.13"}
15+
"coq-mathcomp-ssreflect" {>= "1.13" & < "2.0"}
1616
"coq-fcsl-pcm" {>= "1.7.0"}
1717
"coq-disel" {= version}
1818
]

coq-disel-tpc.opam

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ build: [make "-j%{jobs}%" "tpc"]
1212
depends: [
1313
"ocaml" {>= "4.05.0"}
1414
"coq" {>= "8.14"}
15-
"coq-mathcomp-ssreflect" {>= "1.13"}
15+
"coq-mathcomp-ssreflect" {>= "1.13" & < "2.0"}
1616
"coq-fcsl-pcm" {>= "1.7.0"}
1717
"coq-htt" {>= "1.2.0"}
1818
"ocamlbuild" {build}

coq-disel.opam

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ from implementation details."""
1919

2020
build: ["dune" "build" "-p" name "-j" jobs]
2121
depends: [
22-
"dune" {>= "2.5"}
22+
"dune" {>= "3.5"}
2323
"coq" {>= "8.14"}
24-
"coq-mathcomp-ssreflect" {>= "1.13"}
24+
"coq-mathcomp-ssreflect" {>= "1.13" & < "2.0"}
2525
"coq-fcsl-pcm" {>= "1.7.0"}
2626
"coq-htt" {>= "1.2.0"}
2727
]

dune-project

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
(lang dune 2.5)
2-
(using coq 0.2)
1+
(lang dune 3.5)
2+
(using coq 0.6)
33
(name disel)

meta.yml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,13 @@ supported_coq_versions:
4646
opam: '{>= "8.14"}'
4747

4848
tested_coq_opam_versions:
49-
- version: 'coq-dev'
50-
repo: 'mathcomp/mathcomp-dev'
51-
- version: '1.15.0-coq-8.16'
49+
- version: '1.19.0-coq-8.19'
50+
repo: 'mathcomp/mathcomp'
51+
- version: '1.18.0-coq-8.18'
52+
repo: 'mathcomp/mathcomp'
53+
- version: '1.17.0-coq-8.17'
54+
repo: 'mathcomp/mathcomp'
55+
- version: '1.17.0-coq-8.16'
5256
repo: 'mathcomp/mathcomp'
5357
- version: '1.15.0-coq-8.15'
5458
repo: 'mathcomp/mathcomp'
@@ -64,9 +68,9 @@ tested_coq_opam_versions:
6468
dependencies:
6569
- opam:
6670
name: coq-mathcomp-ssreflect
67-
version: '{>= "1.13"}'
71+
version: '{>= "1.13" & < "2.0"}'
6872
description: |-
69-
[MathComp](https://math-comp.github.io) 1.13.0 or later (`ssreflect` suffices)
73+
[MathComp](https://math-comp.github.io) 1.13.0 to 1.19.0 (`ssreflect` suffices)
7074
- opam:
7175
name: coq-fcsl-pcm
7276
version: '{>= "1.7.0"}'

0 commit comments

Comments
 (0)