diff options
| author | Gaëtan Gilbert | 2019-06-17 14:25:57 +0200 |
|---|---|---|
| committer | Gaëtan Gilbert | 2019-06-17 14:25:57 +0200 |
| commit | 40f440c775a8722d62ca4e87221ea9da1fdac5fa (patch) | |
| tree | 1b5d3e4a7a48b2430e1f70c4c2ada8f22a3affc0 | |
| parent | 535d897ed25f37d454b119a3873a2ff232d3f46e (diff) | |
| parent | 41bd4a25d40aba130b47abf1abfb102b4b4e1fc4 (diff) | |
Merge PR #10382: Ensuring that regular expression filtering in CI (iris) works on MacOS X
Reviewed-by: SkySkimmer
| -rwxr-xr-x | dev/ci/ci-iris-lambda-rust.sh | 6 |
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 |