From dddc3bcaf17c4b5481d1d8829d8604ed25a4f91e Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Wed, 18 Apr 2018 13:19:28 +0200 Subject: fix iris-lambda-rust CI --- dev/ci/ci-iris-lambda-rust.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'dev/ci') diff --git a/dev/ci/ci-iris-lambda-rust.sh b/dev/ci/ci-iris-lambda-rust.sh index b019fa059..63743239f 100755 --- a/dev/ci/ci-iris-lambda-rust.sh +++ b/dev/ci/ci-iris-lambda-rust.sh @@ -16,20 +16,20 @@ opam repo add iris-dev https://gitlab.mpi-sws.org/FP/opam-dev.git -p 0 || opam u git_checkout "${lambdaRust_CI_BRANCH}" "${lambdaRust_CI_GITURL}" "${lambdaRust_CI_DIR}" # Extract required version of Iris -Iris_VERSION=$(grep -F coq-iris < "${lambdaRust_CI_DIR}/opam" | grep -E 'dev\.([0-9.-]+)' -o) +Iris_VERSION=$(grep -F coq-iris < "${lambdaRust_CI_DIR}/opam" | grep -E 'dev\.([0-9a-z.-]+)' -o) Iris_URL=$(opam show "coq-iris.$Iris_VERSION" -f upstream-url) read -r -a Iris_URL_PARTS <<< "$(echo "$Iris_URL" | tr '#' ' ')" # Setup Iris -git_checkout "${Iris_CI_BRANCH}" "${Iris_URL_PARTS[0]}" "${Iris_CI_DIR}" "${Iris_URL_PARTS[1]}" +git_checkout "${Iris_CI_BRANCH}" "${Iris_CI_GITURL}" "${Iris_CI_DIR}" "${Iris_URL_PARTS[1]}" # Extract required version of std++ -stdpp_VERSION=$(grep -F coq-stdpp < "${Iris_CI_DIR}/opam" | grep -E 'dev\.([0-9.-]+)' -o) +stdpp_VERSION=$(grep -F coq-stdpp < "${Iris_CI_DIR}/opam" | grep -E 'dev\.([0-9a-z.-]+)' -o) stdpp_URL=$(opam show "coq-stdpp.$stdpp_VERSION" -f upstream-url) read -r -a stdpp_URL_PARTS <<< "$(echo "$stdpp_URL" | tr '#' ' ')" # Setup std++ -git_checkout "${stdpp_CI_BRANCH}" "${stdpp_URL_PARTS[0]}" "${stdpp_CI_DIR}" "${stdpp_URL_PARTS[1]}" +git_checkout "${stdpp_CI_BRANCH}" "${stdpp_CI_GITURL}" "${stdpp_CI_DIR}" "${stdpp_URL_PARTS[1]}" # Build std++ ( cd "${stdpp_CI_DIR}" && make && make install ) -- cgit v1.2.3