diff options
| -rw-r--r-- | .gitlab-ci.yml | 3 | ||||
| -rw-r--r-- | .travis.yml | 1 | ||||
| -rw-r--r-- | Makefile.ci | 1 | ||||
| -rw-r--r-- | dev/ci/ci-basic-overlay.sh | 6 | ||||
| -rwxr-xr-x | dev/ci/ci-bignums.sh | 16 | ||||
| -rwxr-xr-x | dev/ci/ci-color.sh | 4 | ||||
| -rwxr-xr-x | dev/ci/ci-formal-topology.sh | 4 | ||||
| -rwxr-xr-x | dev/ci/ci-math-classes.sh | 4 |
8 files changed, 30 insertions, 9 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a6a27194a..d5351f573 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -241,6 +241,9 @@ validate:32bit: COMPILER: "$COMPILER_32BIT" EXTRA_PACKAGES: "gcc-multilib" +ci-bignums: + <<: *ci-template + ci-bedrock-src: <<: *ci-template diff --git a/.travis.yml b/.travis.yml index 5cae5fcd3..3d4350dca 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,6 +37,7 @@ env: - TEST_TARGET="test-suite" COMPILER="4.02.3+32bit" - TEST_TARGET="validate" TW="travis_wait" - TEST_TARGET="validate" COMPILER="4.02.3+32bit" TW="travis_wait" + - TEST_TARGET="ci-bignums" - TEST_TARGET="ci-bedrock-src" - TEST_TARGET="ci-bedrock-facade" - TEST_TARGET="ci-color" diff --git a/Makefile.ci b/Makefile.ci index 35eadc7d7..2f7fcd48a 100644 --- a/Makefile.ci +++ b/Makefile.ci @@ -1,4 +1,5 @@ CI_TARGETS=ci-all \ + ci-bignums \ ci-bedrock-facade \ ci-bedrock-src \ ci-color \ diff --git a/dev/ci/ci-basic-overlay.sh b/dev/ci/ci-basic-overlay.sh index 3adc31935..98d342412 100644 --- a/dev/ci/ci-basic-overlay.sh +++ b/dev/ci/ci-basic-overlay.sh @@ -133,3 +133,9 @@ ######################################################################## : ${tlc_CI_BRANCH:=master} : ${tlc_CI_GITURL:=https://gforge.inria.fr/git/tlc/tlc.git} + +######################################################################## +# Bignums +######################################################################## +: ${bignums_CI_BRANCH:=master} +: ${bignums_CI_GITURL:=https://github.com/coq/bignums.git} diff --git a/dev/ci/ci-bignums.sh b/dev/ci/ci-bignums.sh new file mode 100755 index 000000000..ff5935d4c --- /dev/null +++ b/dev/ci/ci-bignums.sh @@ -0,0 +1,16 @@ +#!/usr/bin/env bash + +ci_dir="$(dirname "$0")" + +# This script could be included inside other ones +# Let's avoid to source ci-common twice in this case +if [ -z "${CI_BUILD_DIR}"]; +then + source ${ci_dir}/ci-common.sh +fi + +bignums_CI_DIR=${CI_BUILD_DIR}/Bignums + +git_checkout ${bignums_CI_BRANCH} ${bignums_CI_GITURL} ${bignums_CI_DIR} + +( cd ${bignums_CI_DIR} && make -j ${NJOBS} && make install) diff --git a/dev/ci/ci-color.sh b/dev/ci/ci-color.sh index cb212e845..57f569858 100755 --- a/dev/ci/ci-color.sh +++ b/dev/ci/ci-color.sh @@ -7,9 +7,7 @@ Color_CI_DIR=${CI_BUILD_DIR}/color # Setup Bignums -git_checkout master https://github.com/coq/bignums.git bignums - -( cd bignums && make -j ${NJOBS} && make install ) +source ${ci_dir}/ci-bignums.sh # Compiles CoLoR diff --git a/dev/ci/ci-formal-topology.sh b/dev/ci/ci-formal-topology.sh index 87171ba0b..64b78c039 100755 --- a/dev/ci/ci-formal-topology.sh +++ b/dev/ci/ci-formal-topology.sh @@ -11,9 +11,7 @@ formal_topology_CI_DIR=${CI_BUILD_DIR}/formal-topology # Setup Bignums -git_checkout master https://github.com/coq/bignums.git bignums - -( cd bignums && make -j ${NJOBS} && make install ) +source ${ci_dir}/ci-bignums.sh # Setup Math-Classes diff --git a/dev/ci/ci-math-classes.sh b/dev/ci/ci-math-classes.sh index 10b9d7af2..46581c638 100755 --- a/dev/ci/ci-math-classes.sh +++ b/dev/ci/ci-math-classes.sh @@ -9,9 +9,7 @@ Corn_CI_DIR=${CI_BUILD_DIR}/corn # Setup Bignums -git_checkout master https://github.com/coq/bignums.git bignums - -( cd bignums && make -j ${NJOBS} && make install ) +source ${ci_dir}/ci-bignums.sh # Setup Math-Classes |