Skip to content

Commit 4a06de8

Browse files
committed
Prepare for 9.0 release
1 parent 3edeccf commit 4a06de8

File tree

3 files changed

+35
-23
lines changed

3 files changed

+35
-23
lines changed

.github/workflows/build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
strategy:
1313
matrix:
1414
coq_version:
15-
- 'dev'
15+
- '9.0'
1616
ocaml_version:
1717
- '4.14-flambda'
1818
fail-fast: true
@@ -31,12 +31,12 @@ jobs:
3131
ocaml_version: ${{ matrix.ocaml_version }}
3232
before_script: |
3333
startGroup "Workaround permission issue"
34-
sudo chown -R rocq:rocq . # <--
34+
sudo chown -R 1000:1000 . # <--
3535
opam exec -- ocamlfind list
3636
endGroup
3737
before_install: |
3838
startGroup "Print opam config"
39-
sudo chown -R rocq:rocq .
39+
sudo chown -R coq:coq .
4040
opam config list; opam repo list; opam list
4141
endGroup
4242
script: |

README.md

Lines changed: 29 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,8 @@
11
[![GitHub CI][gh-badge]][gh-link]
22

3-
[gh-badge]: https://github.com/uds-psl/coq-library-undecidability/actions/workflows/build.yml/badge.svg?branch=master
3+
[gh-badge]: https://github.com/uds-psl/coq-library-undecidability/actions/workflows/build.yml/badge.svg?branch=rocq-9.0
44
[gh-link]: https://github.com/uds-psl/coq-library-undecidability/actions/workflows/build.yml
55

6-
# Manual installation for Rocq
7-
8-
```
9-
opam switch create coq-library-undecidability --packages=ocaml-variants.4.14.1+options,ocaml-option-flambda
10-
eval $(opam env)
11-
opam pin add -k git rocq-runtime.dev "https://github.com/coq/coq.git#master"
12-
opam pin add -k git rocq-core.dev "https://github.com/coq/coq.git#master"
13-
opam pin add -k git rocq-stdlib.dev "https://github.com/coq/stdlib.git#master"
14-
opam pin add -k git rocq-prover.dev "https://github.com/coq/coq.git#master"
15-
```
16-
176
# Coq Library of Undecidability Proofs
187

198
[![CI](https://github.com/uds-psl/coq-library-undecidability/workflows/CI/badge.svg?branch=master)](https://github.com/uds-psl/coq-library-undecidability/actions)
@@ -116,17 +105,40 @@ An equivalence proof that most of the mentioned models of computation compute th
116105
- Halting problem for the call-by-value lambda-calculus (`HaltL` in [`L/L.v`](theories/L/L.v))
117106
- Validity, provability, and satisfiability in First-Order Logic (all problems in [`FOL/FOL.v`](theories/FOL/FOL.v))
118107

108+
119109
## Manual Installation Instructions
120110

121-
You need the `master` branch of `Coq` built on OCAML `>= 4.09.1`, and the Template-Coq (part of [MetaCoq](https://metacoq.github.io/)) package for Coq. If you are using opam 2 you can use the following commands to install the dependencies on a new switch:
111+
If you can use `opam 2` on your system, you can follow the instructions here.
112+
113+
### Install from git via opam
114+
115+
You can use `opam` to install the current state of this branch as follows.
116+
117+
We recommend creating a fresh opam switch:
118+
119+
```
120+
opam switch create coq-library-undecidability --packages=ocaml-variants.4.14.1+options,ocaml-option-flambda
121+
eval $(opam env)
122+
```
123+
124+
Then the following commands install the library:
125+
126+
```
127+
opam repo add coq-released https://coq.inria.fr/opam/released
128+
opam update
129+
opam pin add coq-library-undecidability.dev+9.0 "https://github.com/uds-psl/coq-library-undecidability.git#rocq-9.0"
130+
```
131+
132+
### Manual installation
133+
134+
You need `Rocq 9.0` built on OCAML `>= 4.09.1` (but we recommend and test OCaml version `4.14.1+flambda`) and the Template-Coq part of the [MetaCoq](https://metacoq.github.io/) package for Coq. If you are using `opam 2` you can use the following commands to install the dependencies on a new switch:
122135

123136
```
124137
opam switch create coq-library-undecidability --packages=ocaml-variants.4.14.1+options,ocaml-option-flambda
125138
eval $(opam env)
126-
opam pin add -k git rocq-runtime.dev "https://github.com/coq/coq.git#master"
127-
opam pin add -k git rocq-core.dev "https://github.com/coq/coq.git#master"
128-
opam pin add -k git rocq-stdlib.dev "https://github.com/coq/stdlib.git#master"
129-
opam pin add -k git rocq.dev "https://github.com/coq/coq.git#master"
139+
opam repo add rocq-released https://rocq-prover.org/opam/released
140+
opam update
141+
opam install . --deps-only
130142
```
131143

132144
#### Building the undecidability library

opam

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ install: [
2626
[make "install"]
2727
]
2828
depends: [
29-
"rocq-core" {= "dev"}
30-
"rocq-stdlib" {= "dev"}
29+
"rocq-core" {= "9.0"}
30+
"rocq-stdlib" {= "9.0"}
3131
"ocaml"
32-
# "coq-metacoq-template" {= "dev"}
32+
"rocq-metarocq-template" {= "9.0"}
3333
]
3434

3535
synopsis: "A Coq Library of Undecidability Proofs"

0 commit comments

Comments
 (0)