diff options
| author | Emilio Jesus Gallego Arias | 2019-11-21 18:57:45 +0100 |
|---|---|---|
| committer | Emilio Jesus Gallego Arias | 2019-11-21 18:57:45 +0100 |
| commit | 83ab871c90c862ebb08bcc549701beec0afc6cce (patch) | |
| tree | 592c2683c94d3c6198ea251bdcd0aa4b0c16a61c | |
| parent | be06ea8aefe8c1a23f1ff28c3466774dc3983ea6 (diff) | |
| parent | ce4e8c74d98fce84c6a78d2b72bc18d8d34c40b3 (diff) | |
Merge PR #11154: add tlc to ci; please proof read very carefully and test. thanks
Reviewed-by: SkySkimmer
Reviewed-by: ejgallego
| -rw-r--r-- | .gitlab-ci.yml | 3 | ||||
| -rw-r--r-- | Makefile.ci | 1 | ||||
| -rwxr-xr-x | dev/ci/ci-basic-overlay.sh | 5 | ||||
| -rwxr-xr-x | dev/ci/ci-tlc.sh | 8 |
4 files changed, 15 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d415816df2..d566d56331 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -639,6 +639,9 @@ library:ci-sf: library:ci-stdlib2: extends: .ci-template-flambda +library:ci-tlc: + extends: .ci-template + library:ci-unimath: extends: .ci-template-flambda diff --git a/Makefile.ci b/Makefile.ci index 60d4b68f53..e9f7fa2db5 100644 --- a/Makefile.ci +++ b/Makefile.ci @@ -41,6 +41,7 @@ CI_TARGETS= \ ci-sf \ ci-simple-io \ ci-stdlib2 \ + ci-tlc \ ci-unimath \ ci-verdi-raft \ ci-vst diff --git a/dev/ci/ci-basic-overlay.sh b/dev/ci/ci-basic-overlay.sh index 8db0087e3c..5139113083 100755 --- a/dev/ci/ci-basic-overlay.sh +++ b/dev/ci/ci-basic-overlay.sh @@ -188,8 +188,9 @@ ######################################################################## # TLC ######################################################################## -: "${tlc_CI_REF:=master}" -: "${tlc_CI_GITURL:=https://gforge.inria.fr/git/tlc/tlc}" +: "${tlc_CI_REF:=master-for-coq-ci}" +: "${tlc_CI_GITURL:=https://github.com/charguer/tlc}" +: "${tlc_CI_ARCHIVEURL:=${tlc_CI_GITURL}/archive}" ######################################################################## # Bignums diff --git a/dev/ci/ci-tlc.sh b/dev/ci/ci-tlc.sh new file mode 100755 index 0000000000..9802fc4ae1 --- /dev/null +++ b/dev/ci/ci-tlc.sh @@ -0,0 +1,8 @@ +#!/usr/bin/env bash + +ci_dir="$(dirname "$0")" +. "${ci_dir}/ci-common.sh" + +git_download tlc + +( cd "${CI_BUILD_DIR}/tlc" && make && make install ) |
