Skip to content
Snippets Groups Projects
Commit b8c475d2 authored by Ralf Jung's avatar Ralf Jung
Browse files

Merge branch 'coqbump' into 'master'

bump to Coq 8.19

See merge request !66
parents 974b5721 bd1a091f
No related branches found
No related tags found
1 merge request!66bump to Coq 8.19
Pipeline #108195 passed
...@@ -48,10 +48,10 @@ build-coq.dev: ...@@ -48,10 +48,10 @@ build-coq.dev:
OCAML: "ocaml-base-compiler.4.14.0" # for faster rebuilds OCAML: "ocaml-base-compiler.4.14.0" # for faster rebuilds
OPAM_PINS: "coq version dev" OPAM_PINS: "coq version dev"
build-coq.8.18.0: build-coq.8.19.0:
<<: *template <<: *template
variables: variables:
OPAM_PINS: "coq version 8.18.0" OPAM_PINS: "coq version 8.19.0"
DENY_WARNINGS: "1" DENY_WARNINGS: "1"
MANGLE_NAMES: "1" MANGLE_NAMES: "1"
# Coq bench needs an opam package # Coq bench needs an opam package
...@@ -60,18 +60,18 @@ build-coq.8.18.0: ...@@ -60,18 +60,18 @@ build-coq.8.18.0:
- fp-timing - fp-timing
# Separate MR job that does not run on fp-timing. # Separate MR job that does not run on fp-timing.
build-coq.8.18.0-mr: build-coq.8.19.0-mr:
<<: *template <<: *template
<<: *only_mr <<: *only_mr
variables: variables:
OPAM_PINS: "coq version 8.18.0" OPAM_PINS: "coq version 8.19.0"
MANGLE_NAMES: "1" MANGLE_NAMES: "1"
DENY_WARNINGS: "1" DENY_WARNINGS: "1"
trigger-iris.timing: trigger-iris.timing:
<<: *template <<: *template
variables: variables:
OPAM_PINS: "coq version 8.18.0 git+https://gitlab.mpi-sws.org/$IRIS_REPO#$IRIS_REV" OPAM_PINS: "coq version 8.19.0 git+https://gitlab.mpi-sws.org/$IRIS_REPO#$IRIS_REV"
tags: tags:
- fp-timing - fp-timing
only: only:
......
...@@ -6,7 +6,7 @@ Some example verification demonstrating the use of Iris. ...@@ -6,7 +6,7 @@ Some example verification demonstrating the use of Iris.
This version is known to compile with: This version is known to compile with:
- Coq 8.18.0 - Coq 8.19.0
- A development version of [Iris](https://gitlab.mpi-sws.org/iris/iris) - A development version of [Iris](https://gitlab.mpi-sws.org/iris/iris)
- A development version of [Autosubst](https://github.com/coq-community/autosubst) - A development version of [Autosubst](https://github.com/coq-community/autosubst)
......
...@@ -10,7 +10,7 @@ Section persistent_pred. ...@@ -10,7 +10,7 @@ Section persistent_pred.
pers_pred_car :> A PROP; pers_pred_car :> A PROP;
pers_pred_persistent x : Persistent (pers_pred_car x) pers_pred_persistent x : Persistent (pers_pred_car x)
}. }.
Local Arguments PersPred _%I {_}. Local Arguments PersPred _%_I {_}.
Global Existing Instances pers_pred_persistent. Global Existing Instances pers_pred_persistent.
Local Instance persistent_pred_equiv : Equiv persistent_pred := Local Instance persistent_pred_equiv : Equiv persistent_pred :=
...@@ -46,6 +46,6 @@ Section persistent_pred. ...@@ -46,6 +46,6 @@ Section persistent_pred.
End persistent_pred. End persistent_pred.
Global Arguments PersPred {_ _} _%I {_}. Global Arguments PersPred {_ _} _%_I {_}.
Global Arguments pers_pred_car {_ _} !_ _. Global Arguments pers_pred_car {_ _} !_ _.
Global Instance: Params (@pers_pred_car) 2 := {}. Global Instance: Params (@pers_pred_car) 2 := {}.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment