Skip to content

Commit 2bc5d2f

Browse files
committed
Update versions
1 parent 93fccc4 commit 2bc5d2f

File tree

7 files changed

+13
-12
lines changed

7 files changed

+13
-12
lines changed

.devcontainer/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
FROM rocq/rocq-prover:9.0-ocaml-4.14-flambda
1+
FROM rocq/rocq-prover:9.1-ocaml-4.14-flambda
22

33
RUN opam update; \
4-
opam install coq-lsp.0.2.3+9.0 -y; \
4+
opam install coq-lsp.0.2.3+9.1 -y; \
55
opam install ocaml-lsp-server -y

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- name: Build plugin
2020
uses: coq-community/docker-coq-action@v1
2121
with:
22-
custom_image: 'rocq/rocq-prover:9.0-ocaml-4.14-flambda'
22+
custom_image: 'rocq/rocq-prover:9.1-ocaml-4.14-flambda'
2323
opam_file: 'coq-waterproof.opam'
2424
before_script: |
2525
startGroup "Install dependencies"

.github/workflows/doc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
uses: coq-community/docker-coq-action@v1
3333
with:
3434
opam_file: 'coq-waterproof.opam'
35-
custom_image: 'rocq/rocq-prover:9.0-ocaml-4.14-flambda'
35+
custom_image: 'rocq/rocq-prover:9.1-ocaml-4.14-flambda'
3636
before_script: |
3737
startGroup "Install dependencies"
3838
sudo apt-get -y -q install binutils make csh g++ sed gawk autoconf automake autotools-dev

Developer-instructions.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ Most development is done based off the main branch, and then the following setup
3131
```
3232
opam init
3333
eval $(opam env)
34-
opam install coq-lsp.0.2.3+9.0
34+
opam install coq-lsp.0.2.3+9.1
3535
opam install ocaml-lsp-server
3636
```
37-
replacing 9.0 with the desired version of Rocq, or more generally, replacing
38-
0.2.3+9.0 by the desired version of coq-lsp.
37+
replacing 9.1 with the desired version of Rocq, or more generally, replacing
38+
0.2.3+9.1 by the desired version of coq-lsp.
3939

4040
### Creating the desired opam environment: advanced version for supporting multiple versions of Rocq
4141

coq-waterproof.opam

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
opam-version: "2.0"
22
name: "coq-waterproof"
3-
version: "3.0.1+9.0-dev"
3+
version: "3.0.1+9.1-dev"
44
maintainer: "Jim Portegies <[email protected]>"
55
authors: [
66
"Jelle Wemmenhove"
@@ -25,8 +25,9 @@ bug-reports: "https://github.com/impermeable/coq-waterproof/issues"
2525

2626
depends: [
2727
"ocaml" {>= "4.09.0"}
28-
"rocq-prover" {>= "9.0" & < "9.1" | = "dev"}
29-
"coq" {>= "9.0" & < "9.1" | = "dev"}
28+
"rocq-core" {>= "9.1" & < "9.2"}
29+
"rocq-stdlib" {>= "9"}
30+
"coq" {>= "9.1" & < "9.2"}
3031
"dune" {>= "3.8"}
3132
]
3233

dune-project

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55

66
(package
77
(name coq-waterproof)
8-
(version 3.0.1+9.0-dev)
8+
(version 3.0.1+9.1-dev)
99
(synopsis "Coq proofs in a style that resembles non-mechanized mathematical proofs")
1010
(depends rocq-core rocq-stdlib))

src/g_waterproof.mlg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ DECLARE PLUGIN "coq-waterproof.plugin"
2222
open Exceptions
2323
open Waterprove
2424

25-
let waterproof_version : string = "3.0.1+9.0-dev"
25+
let waterproof_version : string = "3.0.1+9.1-dev"
2626
(*
2727
(* The code below is a hack to patch in (open_)lconstr into Ltac2 *)
2828
(* It should be removed when merged to coq-master (open_)lconstr should be in release 9.1 *)

0 commit comments

Comments
 (0)