Skip to content

Commit 3564cc9

Browse files
authored
drop 8.19 (#670)
* drop 8.19
1 parent 7917d4d commit 3564cc9

21 files changed

+36
-5777
lines changed

.github/workflows/doc.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
- name: setup ocaml
2626
uses: avsm/setup-ocaml@v1
2727
with:
28-
ocaml-version: 4.10.1
28+
ocaml-version: 4.14.2
2929

3030
- name: install deps
3131
run: |
@@ -34,7 +34,7 @@ jobs:
3434
opam repo add coq-dev https://coq.inria.fr/opam/core-dev
3535
opam repo add extra-dev https://coq.inria.fr/opam/extra-dev
3636
opam update
37-
opam install coq-serapi ./coq-elpi.opam coq-core.8.19.1
37+
opam install coq-serapi.8.20.0+0.20.0 ./coq-elpi.opam coq-core.8.20.0
3838
sudo apt-get update
3939
sudo apt-get install python3-pip -y
4040
pip3 install git+https://github.com/cpitclaudel/alectryon.git@c8ab1ec

.github/workflows/main.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,17 @@ jobs:
3131
strategy:
3232
fail-fast: false
3333
matrix:
34-
coq_version: [ '8.19.2' , '8.20+rc1' , 'dev' ]
34+
coq_version: [ '8.20+rc1' , 'dev' ]
3535
ocaml_version:
3636
- '4.14.x'
3737
- '5.2.x'
3838
steps:
3939
- uses: actions/checkout@v2
40-
- uses: avsm/setup-ocaml@v2
40+
- uses: avsm/setup-ocaml@v3
4141
with:
4242
ocaml-compiler: ${{ matrix.ocaml_version }}
43+
opam-pin: false
44+
opam-local-packages:
4345
- run: opam repo add coq-dev https://coq.inria.fr/opam/core-dev
4446
- run: opam install coq-core.${{ matrix.coq_version }}
4547
- run: opam install coq-stdlib.${{ matrix.coq_version }}

.github/workflows/nix-action-coq-8.19.yml

Lines changed: 0 additions & 1643 deletions
This file was deleted.

.nix/config.nix

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,6 @@ let master = [
2727
default-bundle = "coq-8.20";
2828
bundles = {
2929

30-
"coq-8.19" = {
31-
coqPackages = common-bundles // {
32-
coq.override.version = "8.19";
33-
};
34-
ocamlPackages = {
35-
elpi.override.version = "v1.19.5";
36-
};
37-
};
38-
3930
"coq-8.20" = {
4031
coqPackages = common-bundles // {
4132
coq.override.version = "8.20";

.nix/coq-nix-toolbox.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
"a9f1e055901cba59260d03d64f523089bf63169c"
1+
"24e96b4870378d5e87fd2d0dd46405b471c286ab"

apps/coercion/src/coq_elpi_coercion_hook.mlg

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,6 @@ open Elpi_plugin
77
open Coq_elpi_arg_syntax
88
open Coq_elpi_vernacular
99

10-
[%%if coq = "8.19" ]
11-
let relevant = Sorts.Relevant
12-
let anonR = Context.anonR
13-
let nameR = Context.nameR
14-
let annotR = Context.annotR
15-
let build_expected_type env sigma expected = sigma, expected, false
16-
let return s g _ = Some (s,g)
17-
[%%else]
1810
let relevant = EConstr.ERelevance.relevant
1911
let anonR = Context.make_annot Names.Name.Anonymous EConstr.ERelevance.irrelevant
2012
let nameR x = Context.make_annot (Names.Name.Name x) EConstr.ERelevance.irrelevant
@@ -30,7 +22,6 @@ let build_expected_type env sigma expected =
3022
sigma, EConstr.mkProd (annotR (Names.Name (Namegen.default_type_ident)), source, target), true
3123
| Coercion.Sort -> let (sigma, t) = Evarutil.new_Type sigma in sigma, t, true
3224
let return s g t = Some (s,g,t)
33-
[%%endif]
3425

3526
let elpi_coercion_hook program env sigma ~flags v ~inferred ~expected =
3627
let loc = API.Ast.Loc.initial "(unknown)" in

0 commit comments

Comments
 (0)