From 6cc6b87f997d7a5e848203b49bfedfaa96c53bb2 Mon Sep 17 00:00:00 2001 From: Olivier Laurent Date: Thu, 30 Apr 2020 15:55:14 +0200 Subject: renaming in Makefile.ci and ci scripts to avoid inconsistencies --- .gitlab-ci.yml | 20 ++++++++++---------- Makefile.ci | 30 +++++++++++++++--------------- dev/ci/ci-basic-overlay.sh | 34 +++++++++++++++++----------------- dev/ci/ci-coq-tools.sh | 9 --------- dev/ci/ci-coq_tools.sh | 9 +++++++++ dev/ci/ci-corn.sh | 4 ++-- dev/ci/ci-cross-crypto.sh | 9 --------- dev/ci/ci-cross_crypto.sh | 9 +++++++++ dev/ci/ci-ext-lib.sh | 8 -------- dev/ci/ci-ext_lib.sh | 8 ++++++++ dev/ci/ci-fcsl-pcm.sh | 10 ---------- dev/ci/ci-fcsl_pcm.sh | 10 ++++++++++ dev/ci/ci-fiat-crypto.sh | 23 ----------------------- dev/ci/ci-fiat_crypto.sh | 23 +++++++++++++++++++++++ dev/ci/ci-flocq.sh | 4 ++-- dev/ci/ci-geocoq.sh | 4 ++-- dev/ci/ci-hott.sh | 4 ++-- dev/ci/ci-iris-lambda-rust.sh | 30 ------------------------------ dev/ci/ci-lambda_rust.sh | 30 ++++++++++++++++++++++++++++++ dev/ci/ci-math-classes.sh | 8 -------- dev/ci/ci-math-comp.sh | 17 ----------------- dev/ci/ci-math_classes.sh | 8 ++++++++ dev/ci/ci-mathcomp.sh | 17 +++++++++++++++++ dev/ci/ci-simple-io.sh | 8 -------- dev/ci/ci-simple_io.sh | 8 ++++++++ dev/ci/ci-verdi-raft.sh | 24 ------------------------ dev/ci/ci-verdi_raft.sh | 24 ++++++++++++++++++++++++ 27 files changed, 196 insertions(+), 196 deletions(-) delete mode 100755 dev/ci/ci-coq-tools.sh create mode 100755 dev/ci/ci-coq_tools.sh delete mode 100755 dev/ci/ci-cross-crypto.sh create mode 100755 dev/ci/ci-cross_crypto.sh delete mode 100755 dev/ci/ci-ext-lib.sh create mode 100755 dev/ci/ci-ext_lib.sh delete mode 100755 dev/ci/ci-fcsl-pcm.sh create mode 100755 dev/ci/ci-fcsl_pcm.sh delete mode 100755 dev/ci/ci-fiat-crypto.sh create mode 100755 dev/ci/ci-fiat_crypto.sh delete mode 100755 dev/ci/ci-iris-lambda-rust.sh create mode 100755 dev/ci/ci-lambda_rust.sh delete mode 100755 dev/ci/ci-math-classes.sh delete mode 100755 dev/ci/ci-math-comp.sh create mode 100755 dev/ci/ci-math_classes.sh create mode 100755 dev/ci/ci-mathcomp.sh delete mode 100755 dev/ci/ci-simple-io.sh create mode 100755 dev/ci/ci-simple_io.sh delete mode 100755 dev/ci/ci-verdi-raft.sh create mode 100755 dev/ci/ci-verdi_raft.sh diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 468161ff73..70e04ee205 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -676,7 +676,7 @@ library:ci-color: library:ci-compcert: extends: .ci-template-flambda -library:ci-coq-tools: +library:ci-coq_tools: extends: .ci-template library:ci-coqprime: @@ -696,16 +696,16 @@ library:ci-coqprime: library:ci-coquelicot: extends: .ci-template -library:ci-cross-crypto: +library:ci-cross_crypto: extends: .ci-template -library:ci-fcsl-pcm: +library:ci-fcsl_pcm: extends: .ci-template # We cannot use flambda due to # https://github.com/ocaml/ocaml/issues/7842, see # https://github.com/coq/coq/pull/11916#issuecomment-609977375 -library:ci-fiat-crypto: +library:ci-fiat_crypto: extends: .ci-template stage: stage-4 needs: @@ -731,10 +731,10 @@ library:ci-corn: needs: - build:edge+flambda - plugin:ci-bignums - - library:ci-math-classes + - library:ci-math_classes dependencies: - build:edge+flambda - - library:ci-math-classes + - library:ci-math_classes library:ci-geocoq: extends: .ci-template-flambda @@ -742,10 +742,10 @@ library:ci-geocoq: library:ci-hott: extends: .ci-template -library:ci-iris-lambda-rust: +library:ci-lambda_rust: extends: .ci-template-flambda -library:ci-math-classes: +library:ci-math_classes: extends: .ci-template-flambda stage: stage-3 artifacts: @@ -759,7 +759,7 @@ library:ci-math-classes: - build:edge+flambda - plugin:ci-bignums -library:ci-math-comp: +library:ci-mathcomp: extends: .ci-template-flambda library:ci-sf: @@ -774,7 +774,7 @@ library:ci-tlc: library:ci-unimath: extends: .ci-template-flambda -library:ci-verdi-raft: +library:ci-verdi_raft: extends: .ci-template-flambda library:ci-vst: diff --git a/Makefile.ci b/Makefile.ci index b545c9de45..af92d476ba 100644 --- a/Makefile.ci +++ b/Makefile.ci @@ -19,22 +19,22 @@ CI_TARGETS= \ ci-coq_dpdgraph \ ci-coquelicot \ ci-corn \ - ci-cross-crypto \ - ci-coq-tools \ + ci-cross_crypto \ + ci-coq_tools \ ci-coqprime \ ci-elpi \ - ci-ext-lib \ + ci-ext_lib \ ci-equations \ - ci-fcsl-pcm \ - ci-fiat-crypto \ + ci-fcsl_pcm \ + ci-fiat_crypto \ ci-fiat_parsers \ ci-flocq \ ci-geocoq \ ci-coqhammer \ ci-hott \ - ci-iris-lambda-rust \ - ci-math-classes \ - ci-math-comp \ + ci-lambda_rust \ + ci-math_classes \ + ci-mathcomp \ ci-metacoq \ ci-mtac2 \ ci-paramcoq \ @@ -44,12 +44,12 @@ CI_TARGETS= \ ci-relation_algebra \ ci-rewriter \ ci-sf \ - ci-simple-io \ + ci-simple_io \ ci-stdlib2 \ ci-tlc \ ci-unimath \ ci-unicoq \ - ci-verdi-raft \ + ci-verdi_raft \ ci-vst .PHONY: ci-all $(CI_TARGETS) @@ -64,16 +64,16 @@ ci-color: ci-bignums ci-coqprime: ci-bignums -ci-math-classes: ci-bignums +ci-math_classes: ci-bignums -ci-corn: ci-math-classes +ci-corn: ci-math_classes ci-mtac2: ci-unicoq -ci-fiat-crypto: ci-coqprime ci-rewriter +ci-fiat_crypto: ci-coqprime ci-rewriter -ci-simple-io: ci-ext-lib -ci-quickchick: ci-ext-lib ci-simple-io +ci-simple_io: ci-ext_lib +ci-quickchick: ci-ext_lib ci-simple_io ci-metacoq: ci-equations diff --git a/dev/ci/ci-basic-overlay.sh b/dev/ci/ci-basic-overlay.sh index f7a8851af7..b87a9c0392 100755 --- a/dev/ci/ci-basic-overlay.sh +++ b/dev/ci/ci-basic-overlay.sh @@ -46,9 +46,9 @@ : "${math_classes_CI_GITURL:=https://github.com/coq-community/math-classes}" : "${math_classes_CI_ARCHIVEURL:=${math_classes_CI_GITURL}/archive}" -: "${Corn_CI_REF:=master}" -: "${Corn_CI_GITURL:=https://github.com/coq-community/corn}" -: "${Corn_CI_ARCHIVEURL:=${Corn_CI_GITURL}/archive}" +: "${corn_CI_REF:=master}" +: "${corn_CI_GITURL:=https://github.com/coq-community/corn}" +: "${corn_CI_ARCHIVEURL:=${corn_CI_GITURL}/archive}" ######################################################################## # Iris @@ -59,19 +59,19 @@ : "${stdpp_CI_GITURL:=https://gitlab.mpi-sws.org/iris/stdpp}" : "${stdpp_CI_ARCHIVEURL:=${stdpp_CI_GITURL}/-/archive}" -: "${Iris_CI_GITURL:=https://gitlab.mpi-sws.org/iris/iris}" -: "${Iris_CI_ARCHIVEURL:=${Iris_CI_GITURL}/-/archive}" +: "${iris_CI_GITURL:=https://gitlab.mpi-sws.org/iris/iris}" +: "${iris_CI_ARCHIVEURL:=${iris_CI_GITURL}/-/archive}" -: "${lambdaRust_CI_REF:=master}" -: "${lambdaRust_CI_GITURL:=https://gitlab.mpi-sws.org/iris/lambda-rust}" -: "${lambdaRust_CI_ARCHIVEURL:=${lambdaRust_CI_GITURL}/-/archive}" +: "${lambda_rust_CI_REF:=master}" +: "${lambda_rust_CI_GITURL:=https://gitlab.mpi-sws.org/iris/lambda-rust}" +: "${lambda_rust_CI_ARCHIVEURL:=${lambda_rust_CI_GITURL}/-/archive}" ######################################################################## # HoTT ######################################################################## -: "${HoTT_CI_REF:=master}" -: "${HoTT_CI_GITURL:=https://github.com/HoTT/HoTT}" -: "${HoTT_CI_ARCHIVEURL:=${HoTT_CI_GITURL}/archive}" +: "${hott_CI_REF:=master}" +: "${hott_CI_GITURL:=https://github.com/HoTT/HoTT}" +: "${hott_CI_ARCHIVEURL:=${hott_CI_GITURL}/archive}" ######################################################################## # CoqHammer @@ -83,16 +83,16 @@ ######################################################################## # GeoCoq ######################################################################## -: "${GeoCoq_CI_REF:=master}" -: "${GeoCoq_CI_GITURL:=https://github.com/GeoCoq/GeoCoq}" -: "${GeoCoq_CI_ARCHIVEURL:=${GeoCoq_CI_GITURL}/archive}" +: "${geocoq_CI_REF:=master}" +: "${geocoq_CI_GITURL:=https://github.com/GeoCoq/GeoCoq}" +: "${geocoq_CI_ARCHIVEURL:=${geocoq_CI_GITURL}/archive}" ######################################################################## # Flocq ######################################################################## -: "${Flocq_CI_REF:=master}" -: "${Flocq_CI_GITURL:=https://gitlab.inria.fr/flocq/flocq}" -: "${Flocq_CI_ARCHIVEURL:=${Flocq_CI_GITURL}/-/archive}" +: "${flocq_CI_REF:=master}" +: "${flocq_CI_GITURL:=https://gitlab.inria.fr/flocq/flocq}" +: "${flocq_CI_ARCHIVEURL:=${flocq_CI_GITURL}/-/archive}" ######################################################################## # coq-tools diff --git a/dev/ci/ci-coq-tools.sh b/dev/ci/ci-coq-tools.sh deleted file mode 100755 index 9c95c49c9f..0000000000 --- a/dev/ci/ci-coq-tools.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash - -ci_dir="$(dirname "$0")" -. "${ci_dir}/ci-common.sh" - -git_download coq_tools - -( cd "${CI_BUILD_DIR}/coq_tools" && make check || \ - { RV=$?; echo "The build broke, if an overlay is needed, mention @JasonGross in describing the expected change in Coq that needs to be taken into account, and he'll prepare a fix for coq-tools"; exit $RV; } ) diff --git a/dev/ci/ci-coq_tools.sh b/dev/ci/ci-coq_tools.sh new file mode 100755 index 0000000000..9c95c49c9f --- /dev/null +++ b/dev/ci/ci-coq_tools.sh @@ -0,0 +1,9 @@ +#!/usr/bin/env bash + +ci_dir="$(dirname "$0")" +. "${ci_dir}/ci-common.sh" + +git_download coq_tools + +( cd "${CI_BUILD_DIR}/coq_tools" && make check || \ + { RV=$?; echo "The build broke, if an overlay is needed, mention @JasonGross in describing the expected change in Coq that needs to be taken into account, and he'll prepare a fix for coq-tools"; exit $RV; } ) diff --git a/dev/ci/ci-corn.sh b/dev/ci/ci-corn.sh index a0c714884c..ac3978dc8d 100755 --- a/dev/ci/ci-corn.sh +++ b/dev/ci/ci-corn.sh @@ -3,6 +3,6 @@ ci_dir="$(dirname "$0")" . "${ci_dir}/ci-common.sh" -git_download Corn +git_download corn -( cd "${CI_BUILD_DIR}/Corn" && ./configure.sh && make && make install ) +( cd "${CI_BUILD_DIR}/corn" && ./configure.sh && make && make install ) diff --git a/dev/ci/ci-cross-crypto.sh b/dev/ci/ci-cross-crypto.sh deleted file mode 100755 index 900d12c1dd..0000000000 --- a/dev/ci/ci-cross-crypto.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash - -ci_dir="$(dirname "$0")" -. "${ci_dir}/ci-common.sh" - -FORCE_GIT=1 -git_download cross_crypto - -( cd "${CI_BUILD_DIR}/cross_crypto" && git submodule update --init --recursive && make ) diff --git a/dev/ci/ci-cross_crypto.sh b/dev/ci/ci-cross_crypto.sh new file mode 100755 index 0000000000..900d12c1dd --- /dev/null +++ b/dev/ci/ci-cross_crypto.sh @@ -0,0 +1,9 @@ +#!/usr/bin/env bash + +ci_dir="$(dirname "$0")" +. "${ci_dir}/ci-common.sh" + +FORCE_GIT=1 +git_download cross_crypto + +( cd "${CI_BUILD_DIR}/cross_crypto" && git submodule update --init --recursive && make ) diff --git a/dev/ci/ci-ext-lib.sh b/dev/ci/ci-ext-lib.sh deleted file mode 100755 index 5eb167d97d..0000000000 --- a/dev/ci/ci-ext-lib.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash - -ci_dir="$(dirname "$0")" -. "${ci_dir}/ci-common.sh" - -git_download ext_lib - -( cd "${CI_BUILD_DIR}/ext_lib" && make && make install) diff --git a/dev/ci/ci-ext_lib.sh b/dev/ci/ci-ext_lib.sh new file mode 100755 index 0000000000..5eb167d97d --- /dev/null +++ b/dev/ci/ci-ext_lib.sh @@ -0,0 +1,8 @@ +#!/usr/bin/env bash + +ci_dir="$(dirname "$0")" +. "${ci_dir}/ci-common.sh" + +git_download ext_lib + +( cd "${CI_BUILD_DIR}/ext_lib" && make && make install) diff --git a/dev/ci/ci-fcsl-pcm.sh b/dev/ci/ci-fcsl-pcm.sh deleted file mode 100755 index cb951630c8..0000000000 --- a/dev/ci/ci-fcsl-pcm.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -ci_dir="$(dirname "$0")" -. "${ci_dir}/ci-common.sh" - -install_ssreflect - -git_download fcsl_pcm - -( cd "${CI_BUILD_DIR}/fcsl_pcm" && make ) diff --git a/dev/ci/ci-fcsl_pcm.sh b/dev/ci/ci-fcsl_pcm.sh new file mode 100755 index 0000000000..cb951630c8 --- /dev/null +++ b/dev/ci/ci-fcsl_pcm.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +ci_dir="$(dirname "$0")" +. "${ci_dir}/ci-common.sh" + +install_ssreflect + +git_download fcsl_pcm + +( cd "${CI_BUILD_DIR}/fcsl_pcm" && make ) diff --git a/dev/ci/ci-fiat-crypto.sh b/dev/ci/ci-fiat-crypto.sh deleted file mode 100755 index 811fefda35..0000000000 --- a/dev/ci/ci-fiat-crypto.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/bin/env bash - -ci_dir="$(dirname "$0")" -. "${ci_dir}/ci-common.sh" - -FORCE_GIT=1 -git_download fiat_crypto - -# We need a larger stack size to not overflow ocamlopt+flambda when -# building the executables. -# c.f. https://github.com/coq/coq/pull/8313#issuecomment-416650241 -fiat_crypto_CI_STACKSIZE=32768 - -# fiat-crypto is not guaranteed to build with the latest version of -# bedrock2, so we use the pinned version of bedrock2, but the external -# version of other developments -fiat_crypto_CI_MAKE_ARGS="EXTERNAL_REWRITER=1 EXTERNAL_COQPRIME=1" -fiat_crypto_CI_TARGETS1="${fiat_crypto_CI_MAKE_ARGS} standalone-ocaml c-files rust-files printlite lite" -fiat_crypto_CI_TARGETS2="${fiat_crypto_CI_MAKE_ARGS} all" - -( cd "${CI_BUILD_DIR}/fiat_crypto" && git submodule update --init --recursive && \ - ulimit -s ${fiat_crypto_CI_STACKSIZE} && \ - make ${fiat_crypto_CI_TARGETS1} && make -j 1 ${fiat_crypto_CI_TARGETS2} ) diff --git a/dev/ci/ci-fiat_crypto.sh b/dev/ci/ci-fiat_crypto.sh new file mode 100755 index 0000000000..811fefda35 --- /dev/null +++ b/dev/ci/ci-fiat_crypto.sh @@ -0,0 +1,23 @@ +#!/usr/bin/env bash + +ci_dir="$(dirname "$0")" +. "${ci_dir}/ci-common.sh" + +FORCE_GIT=1 +git_download fiat_crypto + +# We need a larger stack size to not overflow ocamlopt+flambda when +# building the executables. +# c.f. https://github.com/coq/coq/pull/8313#issuecomment-416650241 +fiat_crypto_CI_STACKSIZE=32768 + +# fiat-crypto is not guaranteed to build with the latest version of +# bedrock2, so we use the pinned version of bedrock2, but the external +# version of other developments +fiat_crypto_CI_MAKE_ARGS="EXTERNAL_REWRITER=1 EXTERNAL_COQPRIME=1" +fiat_crypto_CI_TARGETS1="${fiat_crypto_CI_MAKE_ARGS} standalone-ocaml c-files rust-files printlite lite" +fiat_crypto_CI_TARGETS2="${fiat_crypto_CI_MAKE_ARGS} all" + +( cd "${CI_BUILD_DIR}/fiat_crypto" && git submodule update --init --recursive && \ + ulimit -s ${fiat_crypto_CI_STACKSIZE} && \ + make ${fiat_crypto_CI_TARGETS1} && make -j 1 ${fiat_crypto_CI_TARGETS2} ) diff --git a/dev/ci/ci-flocq.sh b/dev/ci/ci-flocq.sh index 7a9531216e..a3a704091b 100755 --- a/dev/ci/ci-flocq.sh +++ b/dev/ci/ci-flocq.sh @@ -3,6 +3,6 @@ ci_dir="$(dirname "$0")" . "${ci_dir}/ci-common.sh" -git_download Flocq +git_download flocq -( cd "${CI_BUILD_DIR}/Flocq" && autoconf && ./configure && ./remake "-j${NJOBS}" && ./remake install ) +( cd "${CI_BUILD_DIR}/flocq" && autoconf && ./configure && ./remake "-j${NJOBS}" && ./remake install ) diff --git a/dev/ci/ci-geocoq.sh b/dev/ci/ci-geocoq.sh index 8c57318477..e4fc983e68 100755 --- a/dev/ci/ci-geocoq.sh +++ b/dev/ci/ci-geocoq.sh @@ -5,6 +5,6 @@ ci_dir="$(dirname "$0")" install_ssralg -git_download GeoCoq +git_download geocoq -( cd "${CI_BUILD_DIR}/GeoCoq" && ./configure.sh && make ) +( cd "${CI_BUILD_DIR}/geocoq" && ./configure.sh && make ) diff --git a/dev/ci/ci-hott.sh b/dev/ci/ci-hott.sh index c8e6fe690f..4b92c8cb4d 100755 --- a/dev/ci/ci-hott.sh +++ b/dev/ci/ci-hott.sh @@ -3,6 +3,6 @@ ci_dir="$(dirname "$0")" . "${ci_dir}/ci-common.sh" -git_download HoTT +git_download hott -( cd "${CI_BUILD_DIR}/HoTT" && ./autogen.sh -skip-submodules && ./configure && make && make validate ) +( cd "${CI_BUILD_DIR}/hott" && ./autogen.sh -skip-submodules && ./configure && make && make validate ) diff --git a/dev/ci/ci-iris-lambda-rust.sh b/dev/ci/ci-iris-lambda-rust.sh deleted file mode 100755 index d99e140bce..0000000000 --- a/dev/ci/ci-iris-lambda-rust.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/usr/bin/env bash - -ci_dir="$(dirname "$0")" -. "${ci_dir}/ci-common.sh" - -install_ssreflect - -# Setup lambdaRust first -git_download lambdaRust - -# 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-9.-]*\.\([0-9a-z][0-9a-z]*\)".*/\1/') - -# Setup std++ -git_download stdpp - -# Build std++ -( cd "${CI_BUILD_DIR}/stdpp" && make && make install ) - -# Build and validate Iris -( cd "${CI_BUILD_DIR}/Iris" && make && make validate && make install ) - -# Build lambdaRust -( cd "${CI_BUILD_DIR}/lambdaRust" && make && make install ) diff --git a/dev/ci/ci-lambda_rust.sh b/dev/ci/ci-lambda_rust.sh new file mode 100755 index 0000000000..1ef0c2cb8f --- /dev/null +++ b/dev/ci/ci-lambda_rust.sh @@ -0,0 +1,30 @@ +#!/usr/bin/env bash + +ci_dir="$(dirname "$0")" +. "${ci_dir}/ci-common.sh" + +install_ssreflect + +# Setup lambda_rust first +git_download lambda_rust + +# Extract required version of Iris (avoiding "+" which does not work on MacOS :( *) +iris_CI_REF=$(grep -F coq-iris < "${CI_BUILD_DIR}/lambda_rust/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-9.-]*\.\([0-9a-z][0-9a-z]*\)".*/\1/') + +# Setup std++ +git_download stdpp + +# Build std++ +( cd "${CI_BUILD_DIR}/stdpp" && make && make install ) + +# Build and validate Iris +( cd "${CI_BUILD_DIR}/iris" && make && make validate && make install ) + +# Build lambda_rust +( cd "${CI_BUILD_DIR}/lambda_rust" && make && make install ) diff --git a/dev/ci/ci-math-classes.sh b/dev/ci/ci-math-classes.sh deleted file mode 100755 index ae31a8e7f8..0000000000 --- a/dev/ci/ci-math-classes.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash - -ci_dir="$(dirname "$0")" -. "${ci_dir}/ci-common.sh" - -git_download math_classes - -( cd "${CI_BUILD_DIR}/math_classes" && ./configure.sh && make && make install ) diff --git a/dev/ci/ci-math-comp.sh b/dev/ci/ci-math-comp.sh deleted file mode 100755 index cae127ee7b..0000000000 --- a/dev/ci/ci-math-comp.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/env bash - -# $0 is not the safest way, but... -ci_dir="$(dirname "$0")" -. "${ci_dir}/ci-common.sh" - -git_download mathcomp - -( cd "${CI_BUILD_DIR}/mathcomp/mathcomp" && make && make install ) - -git_download fourcolor - -( cd "${CI_BUILD_DIR}/fourcolor" && make && make install ) - -git_download oddorder - -( cd "${CI_BUILD_DIR}/oddorder" && make ) diff --git a/dev/ci/ci-math_classes.sh b/dev/ci/ci-math_classes.sh new file mode 100755 index 0000000000..ae31a8e7f8 --- /dev/null +++ b/dev/ci/ci-math_classes.sh @@ -0,0 +1,8 @@ +#!/usr/bin/env bash + +ci_dir="$(dirname "$0")" +. "${ci_dir}/ci-common.sh" + +git_download math_classes + +( cd "${CI_BUILD_DIR}/math_classes" && ./configure.sh && make && make install ) diff --git a/dev/ci/ci-mathcomp.sh b/dev/ci/ci-mathcomp.sh new file mode 100755 index 0000000000..cae127ee7b --- /dev/null +++ b/dev/ci/ci-mathcomp.sh @@ -0,0 +1,17 @@ +#!/usr/bin/env bash + +# $0 is not the safest way, but... +ci_dir="$(dirname "$0")" +. "${ci_dir}/ci-common.sh" + +git_download mathcomp + +( cd "${CI_BUILD_DIR}/mathcomp/mathcomp" && make && make install ) + +git_download fourcolor + +( cd "${CI_BUILD_DIR}/fourcolor" && make && make install ) + +git_download oddorder + +( cd "${CI_BUILD_DIR}/oddorder" && make ) diff --git a/dev/ci/ci-simple-io.sh b/dev/ci/ci-simple-io.sh deleted file mode 100755 index e7bcd80de7..0000000000 --- a/dev/ci/ci-simple-io.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash - -ci_dir="$(dirname "$0")" -. "${ci_dir}/ci-common.sh" - -git_download simple_io - -( cd "${CI_BUILD_DIR}/simple_io" && make build && make install) diff --git a/dev/ci/ci-simple_io.sh b/dev/ci/ci-simple_io.sh new file mode 100755 index 0000000000..e7bcd80de7 --- /dev/null +++ b/dev/ci/ci-simple_io.sh @@ -0,0 +1,8 @@ +#!/usr/bin/env bash + +ci_dir="$(dirname "$0")" +. "${ci_dir}/ci-common.sh" + +git_download simple_io + +( cd "${CI_BUILD_DIR}/simple_io" && make build && make install) diff --git a/dev/ci/ci-verdi-raft.sh b/dev/ci/ci-verdi-raft.sh deleted file mode 100755 index 3bcd52c464..0000000000 --- a/dev/ci/ci-verdi-raft.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -ci_dir="$(dirname "$0")" -. "${ci_dir}/ci-common.sh" - -git_download struct_tact - -( cd "${CI_BUILD_DIR}/struct_tact" && ./configure && make && make install ) - -git_download inf_seq_ext - -( cd "${CI_BUILD_DIR}/inf_seq_ext" && ./configure && make && make install ) - -git_download cheerios - -( cd "${CI_BUILD_DIR}/cheerios" && ./configure && make && make install ) - -git_download verdi - -( cd "${CI_BUILD_DIR}/verdi" && ./configure && make && make install ) - -git_download verdi_raft - -( cd "${CI_BUILD_DIR}/verdi_raft" && ./configure && make ) diff --git a/dev/ci/ci-verdi_raft.sh b/dev/ci/ci-verdi_raft.sh new file mode 100755 index 0000000000..3bcd52c464 --- /dev/null +++ b/dev/ci/ci-verdi_raft.sh @@ -0,0 +1,24 @@ +#!/usr/bin/env bash + +ci_dir="$(dirname "$0")" +. "${ci_dir}/ci-common.sh" + +git_download struct_tact + +( cd "${CI_BUILD_DIR}/struct_tact" && ./configure && make && make install ) + +git_download inf_seq_ext + +( cd "${CI_BUILD_DIR}/inf_seq_ext" && ./configure && make && make install ) + +git_download cheerios + +( cd "${CI_BUILD_DIR}/cheerios" && ./configure && make && make install ) + +git_download verdi + +( cd "${CI_BUILD_DIR}/verdi" && ./configure && make && make install ) + +git_download verdi_raft + +( cd "${CI_BUILD_DIR}/verdi_raft" && ./configure && make ) -- cgit v1.2.3