From a7254ddc33022e15ae98e38fa014fd0afa8b0d2b Mon Sep 17 00:00:00 2001
From: Hoang-Hai Dang <haidang@mpi-sws.org>
Date: Fri, 1 Feb 2019 20:35:45 +0100
Subject: [PATCH] bump gpfsl + fix CI jobs
---
.gitlab-ci.yml | 2 +-
README.md | 8 ++++----
opam | 6 +++---
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 81698e76..40b918ea 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -50,7 +50,7 @@ build-coq.8.7.2:
build-iris.dev:
<<: *template
variables:
- OPAM_PINS: "coq version 8.8.2 coq-stdpp.dev git git+https://gitlab.mpi-sws.org/iris/stdpp.git#$STDPP_REV coq-iris.dev git git+https://gitlab.mpi-sws.org/FP/iris-coq.git#$IRIS_REV"
+ OPAM_PINS: "coq version 8.8.2 coq-stdpp.dev git git+https://gitlab.mpi-sws.org/iris/stdpp.git#$STDPP_REV coq-gpfsl.dev git git+https://gitlab.mpi-sws.org/iris/gpfsl.git#$GPFSL_REV"
except:
only:
- triggers
diff --git a/README.md b/README.md
index f9e6a9b9..42c571aa 100644
--- a/README.md
+++ b/README.md
@@ -6,14 +6,14 @@ This is the Coq development accompanying RBrlx.
This version is known to compile with:
- - Coq 8.7.2 / 8.8.0
+ - Coq 8.7.2 / 8.8.2
- A development version of [GPFSL].
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:
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
+ opam repo add iris-dev https://gitlab.mpi-sws.org/iris/opam.git
Once you got opam set up, run `make build-dep` to install the right versions
of the dependencies.
@@ -172,5 +172,5 @@ lifetime logic is in [lifetime_sig.v](theories/lifetime/lifetime_sig.v).
* You may have to do `make clean` as Coq will likely complain about .vo file
mismatches.
- [GPFSL]: https://gitlab.mpi-sws.org/FP/gpfsl/
- [ORC11]: https://gitlab.mpi-sws.org/FP/orc11/
+ [GPFSL]: https://gitlab.mpi-sws.org/iris/gpfsl/
+ [ORC11]: https://gitlab.mpi-sws.org/iris/orc11/
diff --git a/opam b/opam
index 79538f43..267b9df1 100644
--- a/opam
+++ b/opam
@@ -4,11 +4,11 @@ version: "dev"
maintainer: "Ralf Jung <jung@mpi-sws.org>"
authors: "The RustBelt Team"
homepage: "http://plv.mpi-sws.org/rustbelt/"
-bug-reports: "https://gitlab.mpi-sws.org/FP/lambdaRust-coq/issues"
-dev-repo: "https://gitlab.mpi-sws.org/FP/lambdaRust-coq.git"
+bug-reports: "https://gitlab.mpi-sws.org/iris/lambda-rust/issues"
+dev-repo: "https://gitlab.mpi-sws.org/iris/lambda-rust.git"
build: [make "-j%{jobs}%"]
install: [make "install"]
remove: [ "sh" "-c" "rm -rf '%{lib}%/coq/user-contrib/lrust'" ]
depends: [
- "coq-gpfsl" { (= "dev.2019-01-31.0.5495b101") | (= "dev") }
+ "coq-gpfsl" { (= "dev.2019-02-01.1.8412a96e") | (= "dev") }
]
--
GitLab