diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0cbbea212be93e01cd7b19c94bb019abcd23edf3..a97362bf77310ad877b54c866af8177acea1b2ec 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 4742abf5984ff95b3327d4b22151d55cd7a78fdd..7f7d7b9899de7853c456060c2d06440636b0cf1c 100644 --- a/README.md +++ b/README.md @@ -6,12 +6,14 @@ Atomicity related verification based on Iris logic. 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. 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,6 +21,9 @@ opam. 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. -## Building +Run `make -jN` to build the full development, where `N` is the number of your +CPU cores. -Run `make` to build the full development. +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`.