From 727f2b18606bf88a744aec2ba2a594312f7f5833 Mon Sep 17 00:00:00 2001
From: Samuel Gruetter
Date: Fri, 8 Feb 2019 17:48:14 -0500
Subject: Workaround for CI not having enough RAM for bedrock2:
 `-async-proofs-tac-j 1`

COQMF_ARGS is a bedrock2-specific name to pass extra arguments to coq_makefile,
and we use VERBOSE=1 for better debuggability
---
 dev/ci/ci-bedrock2.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/ci/ci-bedrock2.sh b/dev/ci/ci-bedrock2.sh
index 5205946261..f901109141 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"' VERBOSE=1 make )
-- 
cgit v1.2.3


From 39075d0d1d6da98f32782f64ca34f326bdca57a1 Mon Sep 17 00:00:00 2001
From: Samuel Gruetter
Date: Sat, 9 Feb 2019 19:30:15 -0500
Subject: remove VERBOSE=1, gitlab log shows that `-async-proofs-tac-j 1` was
 indeed passed

https://gitlab.com/coq/coq/-/jobs/158737429
---
 dev/ci/ci-bedrock2.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/ci/ci-bedrock2.sh b/dev/ci/ci-bedrock2.sh
index f901109141..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 && COQMF_ARGS='-arg "-async-proofs-tac-j 1"' VERBOSE=1 make )
+( cd "${CI_BUILD_DIR}/bedrock2" && git submodule update --init --recursive && COQMF_ARGS='-arg "-async-proofs-tac-j 1"' make )
-- 
cgit v1.2.3


From 614ddf6d1f29a45d8cd089ca62662913370162d5 Mon Sep 17 00:00:00 2001
From: Samuel Gruetter
Date: Sat, 9 Feb 2019 19:37:10 -0500
Subject: remove `allow_failure: true` for bedrock2

---
 .gitlab-ci.yml | 1 -
 1 file changed, 1 deletion(-)

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
-- 
cgit v1.2.3