aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmilio Jesus Gallego Arias2019-02-11 01:03:33 +0100
committerEmilio Jesus Gallego Arias2019-02-11 01:03:33 +0100
commitf8f27d0f5a39c8c55b33e31a73500a2e054b6764 (patch)
tree1b4fd070b6b342a495928c512945841924e987df
parent1663eb4c372b240401233b9554660da379916f66 (diff)
parent614ddf6d1f29a45d8cd089ca62662913370162d5 (diff)
Merge PR #9534: Workaround for CI not having enough RAM for bedrock2: `-async-proofs-tac-j 1`
Reviewed-by: ejgallego
-rw-r--r--.gitlab-ci.yml1
-rwxr-xr-xdev/ci/ci-bedrock2.sh2
2 files changed, 1 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fac5abf13f..77e34d4e00 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -524,7 +524,6 @@ validate:quick:
library:ci-bedrock2:
<<: *ci-template
- allow_failure: true
library:ci-color:
<<: *ci-template-flambda
diff --git a/dev/ci/ci-bedrock2.sh b/dev/ci/ci-bedrock2.sh
index 5205946261..2ac78d3c2b 100755
--- a/dev/ci/ci-bedrock2.sh
+++ b/dev/ci/ci-bedrock2.sh
@@ -6,4 +6,4 @@ ci_dir="$(dirname "$0")"
FORCE_GIT=1
git_download bedrock2
-( cd "${CI_BUILD_DIR}/bedrock2" && git submodule update --init --recursive && make )
+( cd "${CI_BUILD_DIR}/bedrock2" && git submodule update --init --recursive && COQMF_ARGS='-arg "-async-proofs-tac-j 1"' make )