From 44b2c7979e1ea3a834f4e9bd2fcd631d568b895e Mon Sep 17 00:00:00 2001
From: Emilio Jesus Gallego Arias
Date: Wed, 22 Mar 2017 17:17:33 +0100
Subject: [travis] Fix iris-coq build.

We need to do a bit of hacking, but it should be fine for the short
term.

c.f. https://gitlab.mpi-sws.org/FP/iris-coq/issues/83
---
 dev/ci/ci-iris-coq.sh | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'dev/ci/ci-iris-coq.sh')

diff --git a/dev/ci/ci-iris-coq.sh b/dev/ci/ci-iris-coq.sh
index eb1d1be078..262dd6fa01 100755
--- a/dev/ci/ci-iris-coq.sh
+++ b/dev/ci/ci-iris-coq.sh
@@ -9,14 +9,18 @@ Iris_CI_DIR=${CI_BUILD_DIR}/iris-coq
 
 install_ssreflect
 
-# Setup stdpp
+# Setup Iris first, as it is needed to compute the dependencies
 
-git_checkout ${stdpp_CI_BRANCH} ${stdpp_CI_GITURL} ${stdpp_CI_DIR}
+git_checkout ${Iris_CI_BRANCH} ${Iris_CI_GITURL} ${Iris_CI_DIR}
+read -a IRIS_DEP < ${Iris_CI_DIR}/opam.pins
 
-( cd ${stdpp_CI_DIR} && make -j ${NJOBS} && make install )
+# Setup stdpp
+stdpp_CI_GITURL=${IRIS_DEP[1]}.git
+stdpp_CI_COMMIT=${IRIS_DEP[2]}
 
-# Setup Iris
+git_checkout ${stdpp_CI_BRANCH} ${stdpp_CI_GITURL} ${stdpp_CI_DIR} ${stdpp_CI_COMMIT}
 
-git_checkout ${Iris_CI_BRANCH} ${Iris_CI_GITURL} ${Iris_CI_DIR}
+( cd ${stdpp_CI_DIR} && make -j ${NJOBS} && make install )
 
+# Build iris now
 ( cd ${Iris_CI_DIR} && make -j ${NJOBS} )
-- 
cgit v1.2.3