Skip to content

Commit

Permalink
Merge pull request #44 Update boilerplate for MathComp 1.14.0
Browse files Browse the repository at this point in the history
  • Loading branch information
chdoc committed Jan 20, 2022
2 parents 8c6ba52 + f0a8655 commit ddb0dd4
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 3 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/docker-action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ jobs:
matrix:
image:
- 'mathcomp/mathcomp-dev:coq-dev'
- 'mathcomp/mathcomp:1.14.0-coq-8.15'
- 'mathcomp/mathcomp:1.14.0-coq-8.14'
- 'mathcomp/mathcomp:1.13.0-coq-8.15'
- 'mathcomp/mathcomp:1.13.0-coq-8.14'
- 'mathcomp/mathcomp:1.13.0-coq-8.13'
Expand Down
2 changes: 1 addition & 1 deletion coq-reglang.opam
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ build: ["dune" "build" "-p" name "-j" jobs]
depends: [
"dune" {>= "2.5"}
"coq" {(>= "8.10" & < "8.16~") | (= "dev")}
"coq-mathcomp-ssreflect" {(>= "1.11" & < "1.14~") | (= "dev")}
"coq-mathcomp-ssreflect" {(>= "1.11" & < "1.15~") | (= "dev")}
]

tags: [
Expand Down
6 changes: 5 additions & 1 deletion meta.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ supported_coq_versions:
dependencies:
- opam:
name: coq-mathcomp-ssreflect
version: '{(>= "1.11" & < "1.14~") | (= "dev")}'
version: '{(>= "1.11" & < "1.15~") | (= "dev")}'
description: |-
[MathComp](https://math-comp.github.io) 1.11.0 or later (`ssreflect` suffices)
Expand All @@ -69,6 +69,10 @@ tested_coq_nix_versions:
tested_coq_opam_versions:
- version: 'coq-dev'
repo: 'mathcomp/mathcomp-dev'
- version: '1.14.0-coq-8.15'
repo: 'mathcomp/mathcomp'
- version: '1.14.0-coq-8.14'
repo: 'mathcomp/mathcomp'
- version: '1.13.0-coq-8.15'
repo: 'mathcomp/mathcomp'
- version: '1.13.0-coq-8.14'
Expand Down
2 changes: 1 addition & 1 deletion theories/languages.v
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ Definition plus l1 l2 : dlang char := [pred w | (w \in l1) || (w \in l2)].
Definition residual x l : dlang char := [pred w | x :: w \in l].

(** For the concatenation of two decidable languages, we use finite
types. Note that we need to use [L1] and [L2] applicatively in order
types. Note that we need to use [l1] and [l2] applicatively in order
for the termination check for [star] to succeed. *)

Definition conc l1 l2 : dlang char :=
Expand Down

0 comments on commit ddb0dd4

Please sign in to comment.