diff options
author | Emilio Jesus Gallego Arias <e+git@x80.org> | 2018-05-10 14:08:15 +0200 |
---|---|---|
committer | Emilio Jesus Gallego Arias <e+git@x80.org> | 2018-05-10 14:08:15 +0200 |
commit | e559f7553030dc3a86936794d0f80f39b0131960 (patch) | |
tree | f612099313b3790dde5c2e1edb38b71f429e9613 | |
parent | 45171b6e34f01392dabee285f616f3f6f4217e98 (diff) | |
parent | fcb522e8a8994d80cb363096bda62fa30f762001 (diff) |
Merge PR #7473: [ci] Add mit-plv/cross-crypto
-rw-r--r-- | .circleci/config.yml | 4 | ||||
-rw-r--r-- | .gitlab-ci.yml | 3 | ||||
-rw-r--r-- | .travis.yml | 3 | ||||
-rw-r--r-- | Makefile.ci | 1 | ||||
-rwxr-xr-x | dev/ci/ci-basic-overlay.sh | 6 | ||||
-rwxr-xr-x | dev/ci/ci-cross-crypto.sh | 11 |
6 files changed, 28 insertions, 0 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index 892175381..14c102ced 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -85,6 +85,9 @@ jobs: coquelicot: <<: *ci-template + cross-crypto: + <<: *ci-template + elpi: <<: *ci-template @@ -160,6 +163,7 @@ workflows: - compcert: *req-main - coq-dpdgraph: *req-main - coquelicot: *req-main + - cross-crypto: *req-main - elpi: *req-main - equations: *req-main - geocoq: *req-main diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1789846c8..ac4304da1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -242,6 +242,9 @@ ci-coq-dpdgraph: ci-coquelicot: <<: *ci-template +ci-cross-crypto: + <<: *ci-template + ci-elpi: <<: *ci-template diff --git a/.travis.yml b/.travis.yml index 08b255cdf..d7caf1daf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -76,6 +76,9 @@ matrix: - TEST_TARGET="ci-coquelicot" - if: NOT (type = pull_request) env: + - TEST_TARGET="ci-cross-crypto" + - if: NOT (type = pull_request) + env: - TEST_TARGET="ci-elpi" EXTRA_OPAM="elpi" # ppx_tools_versioned requires a specific version findlib - FINDLIB_VER="" diff --git a/Makefile.ci b/Makefile.ci index 4d4f1df59..ce725d19d 100644 --- a/Makefile.ci +++ b/Makefile.ci @@ -15,6 +15,7 @@ CI_TARGETS=ci-bignums \ ci-coquelicot \ ci-corn \ ci-cpdt \ + ci-cross-crypto \ ci-elpi \ ci-equations \ ci-fcsl-pcm \ diff --git a/dev/ci/ci-basic-overlay.sh b/dev/ci/ci-basic-overlay.sh index 1ae2ad0ac..b7faea13e 100755 --- a/dev/ci/ci-basic-overlay.sh +++ b/dev/ci/ci-basic-overlay.sh @@ -91,6 +91,12 @@ : "${VST_CI_GITURL:=https://github.com/PrincetonUniversity/VST.git}" ######################################################################## +# cross-crypto +######################################################################## +: "${cross_crypto_CI_BRANCH:=master}" +: "${cross_crypto_CI_GITURL:=https://github.com/mit-plv/cross-crypto.git}" + +######################################################################## # fiat_parsers ######################################################################## : "${fiat_parsers_CI_BRANCH:=master}" diff --git a/dev/ci/ci-cross-crypto.sh b/dev/ci/ci-cross-crypto.sh new file mode 100755 index 000000000..a0d3aa655 --- /dev/null +++ b/dev/ci/ci-cross-crypto.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +ci_dir="$(dirname "$0")" +. "${ci_dir}/ci-common.sh" + +cross_crypto_CI_DIR="${CI_BUILD_DIR}/cross-crypto" + +git_checkout "${cross_crypto_CI_BRANCH}" "${cross_crypto_CI_GITURL}" "${cross_crypto_CI_DIR}" +( cd "${cross_crypto_CI_DIR}" && git submodule update --init --recursive ) + +( cd "${cross_crypto_CI_DIR}" && make ) |