From 82f081ccc2136e9320ce9539a3b8979938a1d028 Mon Sep 17 00:00:00 2001
From: Ralf Jung <jung@mpi-sws.org>
Date: Mon, 18 Dec 2017 14:13:26 +0100
Subject: [PATCH] test against Coq 8.7.1
---
.gitlab-ci.yml | 6 +++---
README.md | 20 +++++++++-----------
2 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0cbbea21..a97362bf 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -26,10 +26,10 @@ variables:
- master
- /^ci/
-build-coq.8.7.0:
+build-coq.8.7.1:
<<: *template
variables:
- OPAM_PINS: "coq version 8.7.0 coq-mathcomp-ssreflect version 1.6.4"
+ OPAM_PINS: "coq version 8.7.1 coq-mathcomp-ssreflect version 1.6.4"
except:
- triggers
@@ -47,6 +47,6 @@ build-coq.8.6.1:
build-iris.dev:
<<: *template
variables:
- OPAM_PINS: "coq version 8.7.0 coq-mathcomp-ssreflect version 1.6.4 coq-iris.dev git https://gitlab.mpi-sws.org/FP/iris-coq.git#$IRIS_REV"
+ OPAM_PINS: "coq version 8.7.1 coq-mathcomp-ssreflect version 1.6.4 coq-iris.dev git https://gitlab.mpi-sws.org/FP/iris-coq.git#$IRIS_REV"
only:
- triggers
diff --git a/README.md b/README.md
index dc8bd6a3..1418ba0c 100644
--- a/README.md
+++ b/README.md
@@ -6,12 +6,14 @@ This is the Coq development accompanying lambda-Rust.
This version is known to compile with:
- - Coq 8.6.1 / 8.7.0
+ - Coq 8.6.1 / 8.7.1
- Ssreflect 1.6.4
- A development version of [Iris](https://gitlab.mpi-sws.org/FP/iris-coq/)
-The easiest way to install the correct versions of the dependencies is through
-opam (1.2.2 or newer). You will need the Coq and Iris opam repositories:
+## Building from source
+
+When building from source, we recommend to use opam (1.2.2 or newer) for
+installing the dependencies. This requires the following two repositories:
opam repo add coq-released https://coq.inria.fr/opam/released
opam repo add iris-dev https://gitlab.mpi-sws.org/FP/opam-dev.git
@@ -19,17 +21,13 @@ opam (1.2.2 or newer). You will need the Coq and Iris opam repositories:
Once you got opam set up, run `make build-dep` to install the right versions
of the dependencies.
-## Updating
-
-After doing `git pull`, the development may fail to compile because of outdated
-dependencies. To fix that, please run `opam update` followed by
-`make build-dep`.
-
-## Building
-
Run `make -jN` to build the full development, where `N` is the number of your
CPU cores.
+To update, do `git pull`. After an update, the development may fail to compile
+because of outdated dependencies. To fix that, please run `opam update`
+followed by `make build-dep`.
+
## Structure
* The folder [lang](theories/lang) contains the formalization of the lambda-Rust
--
GitLab