aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Maxime Dénès <mail@maximedenes.fr>2017-10-05 18:23:49 +0200
committerGravatar Maxime Dénès <mail@maximedenes.fr>2017-10-05 18:23:49 +0200
commit85b1deda0348f1fd32f7019fb1e7bfabd297a751 (patch)
tree1dfe7a3df1fef0672d2a6ee7529b7ae520ae789b
parent8b5f7ad0722e5ed1b87589ae103a1c4c5974416f (diff)
parent0fe3775278112621f1c9cbf76282a20f48bec8d1 (diff)
Merge PR #1112: Fix GeoCoq CI and remove it from allowed failures
-rw-r--r--.travis.yml3
-rwxr-xr-xdev/ci/ci-geocoq.sh6
2 files changed, 1 insertions, 8 deletions
diff --git a/.travis.yml b/.travis.yml
index 6c926aacb..8d85ffc68 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -62,9 +62,6 @@ env:
matrix:
- allow_failures:
- - env: TEST_TARGET="ci-geocoq TIMED=1"
-
include:
# Full Coq test-suite with two compilers
- env:
diff --git a/dev/ci/ci-geocoq.sh b/dev/ci/ci-geocoq.sh
index eadeb7c38..8e6448e76 100755
--- a/dev/ci/ci-geocoq.sh
+++ b/dev/ci/ci-geocoq.sh
@@ -8,9 +8,5 @@ GeoCoq_CI_DIR=${CI_BUILD_DIR}/GeoCoq
git_checkout ${GeoCoq_CI_BRANCH} ${GeoCoq_CI_GITURL} ${GeoCoq_CI_DIR}
( cd ${GeoCoq_CI_DIR} && \
- ./configure.sh && \
- sed -i.bak '/Ch16_coordinates_with_functions\.v/d' Make && \
- sed -i.bak '/Elements\/Book_1\.v/d' Make && \
- sed -i.bak '/Elements\/Book_3\.v/d' Make && \
- coq_makefile -f Make -o Makefile && \
+ ./configure-ci.sh && \
make )