diff options
| author |  Maxime Dénès <mail@maximedenes.fr> | 2018-01-31 07:44:31 +0100 |
|---|---|---|
| committer | Maxime Dénès <mail@maximedenes.fr> | 2018-01-31 07:44:31 +0100 |
| commit | 556360215c910c8ae6d14b3582330fda055fff53 (patch) | |
| tree | 0e9e7314b7e3dcfcb9ae5275f671d6188831229b | |
| parent | 1e39f1323a79d1a06ba0db9fd110710e9176ddbd (diff) | |
| parent | fface0eef97f9a9d9c4dbf193598909b0a62e6ca (diff) | |
Merge PR #6641: ci-compcert.sh: use default value for NJOBS when installing menhir.
| -rw-r--r-- | dev/ci/ci-common.sh | 4 | ||||
| -rwxr-xr-x | dev/ci/ci-compcert.sh | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/dev/ci/ci-common.sh b/dev/ci/ci-common.sh index 1838db5d0..05fa33e97 100644 --- a/dev/ci/ci-common.sh +++ b/dev/ci/ci-common.sh @@ -2,6 +2,10 @@ set -xe +# default value for NJOBS +: "${NJOBS:=1}" +export NJOBS + if [ -n "${GITLAB_CI}" ]; then export COQBIN="$PWD/_install_ci/bin" diff --git a/dev/ci/ci-compcert.sh b/dev/ci/ci-compcert.sh index fc3cef342..6a0ce2aef 100755 --- a/dev/ci/ci-compcert.sh +++ b/dev/ci/ci-compcert.sh @@ -5,7 +5,7 @@ source ${ci_dir}/ci-common.sh CompCert_CI_DIR=${CI_BUILD_DIR}/CompCert -opam install -j ${NJOBS} -y menhir +opam install -j "$NJOBS" -y menhir git_checkout ${CompCert_CI_BRANCH} ${CompCert_CI_GITURL} ${CompCert_CI_DIR} ( cd ${CompCert_CI_DIR} && ./configure -ignore-coq-version x86_32-linux && make && make check-proof ) |