aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHugo Herbelin2019-06-16 20:09:25 +0200
committerHugo Herbelin2019-06-16 20:42:13 +0200
commit41bd4a25d40aba130b47abf1abfb102b4b4e1fc4 (patch)
tree032aae82c0c2acc4c09bcf86d905c1ee8ea8ff03
parent6eba5b5ba91f9ec02b809e0c223324e0f4fdbf85 (diff)
Ensuring regexp filtering in ci works on MacOS X.
Unfortunately, "+" regular expressions are not supported by default with MacOS X's sed. It is told that it would work with option -E though, but the syntax seems then different.
-rwxr-xr-xdev/ci/ci-iris-lambda-rust.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/dev/ci/ci-iris-lambda-rust.sh b/dev/ci/ci-iris-lambda-rust.sh
index 95f143bb95..d99e140bce 100755
--- a/dev/ci/ci-iris-lambda-rust.sh
+++ b/dev/ci/ci-iris-lambda-rust.sh
@@ -8,14 +8,14 @@ install_ssreflect
# Setup lambdaRust first
git_download lambdaRust
-# Extract required version of Iris
-Iris_CI_REF=$(grep -F coq-iris < "${CI_BUILD_DIR}/lambdaRust/opam" | sed 's/.*"dev\.[0-9.-]\+\.\([0-9a-z]\+\)".*/\1/')
+# Extract required version of Iris (avoiding "+" which does not work on MacOS :( *)
+Iris_CI_REF=$(grep -F coq-iris < "${CI_BUILD_DIR}/lambdaRust/opam" | sed 's/.*"dev\.[0-9][0-9.-]*\.\([0-9a-z][0-9a-z]*\)".*/\1/')
# Setup Iris
git_download Iris
# Extract required version of std++
-stdpp_CI_REF=$(grep -F coq-stdpp < "${CI_BUILD_DIR}/Iris/opam" | sed 's/.*"dev\.[0-9.-]\+\.\([0-9a-z]\+\)".*/\1/')
+stdpp_CI_REF=$(grep -F coq-stdpp < "${CI_BUILD_DIR}/Iris/opam" | sed 's/.*"dev\.[0-9][0-9.-]*\.\([0-9a-z][0-9a-z]*\)".*/\1/')
# Setup std++
git_download stdpp