From e79430126e2d0ec55aec5937c53abba22f0df307 Mon Sep 17 00:00:00 2001 From: Enrico Tassi Date: Tue, 24 Nov 2020 17:47:18 +0100 Subject: [ci] coquelicot, run make install --- dev/ci/ci-coquelicot.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'dev/ci') diff --git a/dev/ci/ci-coquelicot.sh b/dev/ci/ci-coquelicot.sh index ffe92dcecf..a5405a2b62 100755 --- a/dev/ci/ci-coquelicot.sh +++ b/dev/ci/ci-coquelicot.sh @@ -7,4 +7,4 @@ install_ssreflect git_download coquelicot -( cd "${CI_BUILD_DIR}/coquelicot" && autoreconf -i -s && ./configure && ./remake "-j${NJOBS}" ) +( cd "${CI_BUILD_DIR}/coquelicot" && autoreconf -i -s && ./configure && ./remake "-j${NJOBS}" && ./remake install ) -- cgit v1.2.3 From 66370041661beb850c20d53d43111674a32d84b2 Mon Sep 17 00:00:00 2001 From: Enrico Tassi Date: Tue, 24 Nov 2020 16:47:25 +0100 Subject: [ci] add job for interval --- dev/ci/ci-interval.sh | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100755 dev/ci/ci-interval.sh (limited to 'dev/ci') diff --git a/dev/ci/ci-interval.sh b/dev/ci/ci-interval.sh new file mode 100755 index 0000000000..30d437363f --- /dev/null +++ b/dev/ci/ci-interval.sh @@ -0,0 +1,8 @@ +#!/usr/bin/env bash + +ci_dir="$(dirname "$0")" +. "${ci_dir}/ci-common.sh" + +git_download interval + +( cd "${CI_BUILD_DIR}/interval" && autoconf && ./configure && ./remake "-j${NJOBS}" && ./remake install ) -- cgit v1.2.3 From fdf2f92ed5e2e838ffb11183c00f724e4e7c3a51 Mon Sep 17 00:00:00 2001 From: Enrico Tassi Date: Tue, 24 Nov 2020 19:31:56 +0100 Subject: [ci] separate oddorder and fourcolor from mathcomp In this way interval does not have to wait too much --- dev/ci/ci-fourcolor.sh | 8 ++++++++ dev/ci/ci-mathcomp.sh | 8 -------- dev/ci/ci-oddorder.sh | 8 ++++++++ 3 files changed, 16 insertions(+), 8 deletions(-) create mode 100755 dev/ci/ci-fourcolor.sh create mode 100755 dev/ci/ci-oddorder.sh (limited to 'dev/ci') diff --git a/dev/ci/ci-fourcolor.sh b/dev/ci/ci-fourcolor.sh new file mode 100755 index 0000000000..72a1567398 --- /dev/null +++ b/dev/ci/ci-fourcolor.sh @@ -0,0 +1,8 @@ +#!/usr/bin/env bash + +ci_dir="$(dirname "$0")" +. "${ci_dir}/ci-common.sh" + +git_download fourcolor + +( cd "${CI_BUILD_DIR}/fourcolor" && make && make install ) diff --git a/dev/ci/ci-mathcomp.sh b/dev/ci/ci-mathcomp.sh index b1aa56ec4e..f170b35327 100755 --- a/dev/ci/ci-mathcomp.sh +++ b/dev/ci/ci-mathcomp.sh @@ -7,11 +7,3 @@ ci_dir="$(dirname "$0")" git_download mathcomp ( cd "${CI_BUILD_DIR}/mathcomp/mathcomp" && make && make test-suite && 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-oddorder.sh b/dev/ci/ci-oddorder.sh new file mode 100755 index 0000000000..b2da32ad61 --- /dev/null +++ b/dev/ci/ci-oddorder.sh @@ -0,0 +1,8 @@ +#!/usr/bin/env bash + +ci_dir="$(dirname "$0")" +. "${ci_dir}/ci-common.sh" + +git_download oddorder + +( cd "${CI_BUILD_DIR}/oddorder" && make && make install ) -- cgit v1.2.3 From 0c3b900708bbc79e411ea0e60017abde89106a95 Mon Sep 17 00:00:00 2001 From: Enrico Tassi Date: Wed, 25 Nov 2020 15:44:16 +0100 Subject: [ci] avoid always rebuilding jobs that use remake --- dev/ci/ci-coquelicot.sh | 2 +- dev/ci/ci-flocq.sh | 2 +- dev/ci/ci-interval.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'dev/ci') diff --git a/dev/ci/ci-coquelicot.sh b/dev/ci/ci-coquelicot.sh index a5405a2b62..5b4d953e7b 100755 --- a/dev/ci/ci-coquelicot.sh +++ b/dev/ci/ci-coquelicot.sh @@ -7,4 +7,4 @@ install_ssreflect git_download coquelicot -( cd "${CI_BUILD_DIR}/coquelicot" && autoreconf -i -s && ./configure && ./remake "-j${NJOBS}" && ./remake install ) +( cd "${CI_BUILD_DIR}/coquelicot" && ( if [ ! -x ./configure ]; then autoreconf -i -s && ./configure; fi ) && ./remake "-j${NJOBS}" && ./remake install ) diff --git a/dev/ci/ci-flocq.sh b/dev/ci/ci-flocq.sh index a3a704091b..cb6c3e6452 100755 --- a/dev/ci/ci-flocq.sh +++ b/dev/ci/ci-flocq.sh @@ -5,4 +5,4 @@ ci_dir="$(dirname "$0")" git_download flocq -( cd "${CI_BUILD_DIR}/flocq" && autoconf && ./configure && ./remake "-j${NJOBS}" && ./remake install ) +( cd "${CI_BUILD_DIR}/flocq" && ( if [ ! -x ./configure ]; then autoconf && ./configure; fi ) && ./remake "-j${NJOBS}" && ./remake install ) diff --git a/dev/ci/ci-interval.sh b/dev/ci/ci-interval.sh index 30d437363f..1e89aac629 100755 --- a/dev/ci/ci-interval.sh +++ b/dev/ci/ci-interval.sh @@ -5,4 +5,4 @@ ci_dir="$(dirname "$0")" git_download interval -( cd "${CI_BUILD_DIR}/interval" && autoconf && ./configure && ./remake "-j${NJOBS}" && ./remake install ) +( cd "${CI_BUILD_DIR}/interval" && ( if [ ! -x ./configure ]; then autoconf && ./configure; fi ) && ./remake "-j${NJOBS}" && ./remake install ) -- cgit v1.2.3 From 0c49f8c4c03659126e7976390fc6ec876fd6c1ce Mon Sep 17 00:00:00 2001 From: Enrico Tassi Date: Wed, 25 Nov 2020 15:44:55 +0100 Subject: [ci] coquelicot, depend on ssr proper --- dev/ci/ci-coquelicot.sh | 2 -- 1 file changed, 2 deletions(-) (limited to 'dev/ci') diff --git a/dev/ci/ci-coquelicot.sh b/dev/ci/ci-coquelicot.sh index 5b4d953e7b..777d36a6d7 100755 --- a/dev/ci/ci-coquelicot.sh +++ b/dev/ci/ci-coquelicot.sh @@ -3,8 +3,6 @@ ci_dir="$(dirname "$0")" . "${ci_dir}/ci-common.sh" -install_ssreflect - git_download coquelicot ( cd "${CI_BUILD_DIR}/coquelicot" && ( if [ ! -x ./configure ]; then autoreconf -i -s && ./configure; fi ) && ./remake "-j${NJOBS}" && ./remake install ) -- cgit v1.2.3 From 8ee0c8fad103366f02b24eb912cdfaf9cb31fc65 Mon Sep 17 00:00:00 2001 From: Enrico Tassi Date: Thu, 26 Nov 2020 09:01:22 +0100 Subject: [ci] interval, disable native-compute --- dev/ci/ci-interval.sh | 1 + 1 file changed, 1 insertion(+) (limited to 'dev/ci') diff --git a/dev/ci/ci-interval.sh b/dev/ci/ci-interval.sh index 1e89aac629..fe7b3f9fbe 100755 --- a/dev/ci/ci-interval.sh +++ b/dev/ci/ci-interval.sh @@ -5,4 +5,5 @@ ci_dir="$(dirname "$0")" git_download interval +export COQEXTRAFLAGS='-native-compiler no' ( cd "${CI_BUILD_DIR}/interval" && ( if [ ! -x ./configure ]; then autoconf && ./configure; fi ) && ./remake "-j${NJOBS}" && ./remake install ) -- cgit v1.2.3