aboutsummaryrefslogtreecommitdiff
path: root/dev/ci
diff options
context:
space:
mode:
authorMichael Soegtrop2019-05-09 10:44:15 +0200
committerMichael Soegtrop2019-05-09 21:05:44 +0200
commit281e6657c7fe5033a13c7a2fd2b6cc6f51cb6911 (patch)
tree3e787ec5b5ffd9b6c72c9e9ee605df1545c67aca /dev/ci
parent5d426eecb6c7f2e956cde98780aef349fdc75af0 (diff)
Switched Coquelicot CI URLs from INRIA gforge to INRIA gitlab
Diffstat (limited to 'dev/ci')
-rwxr-xr-xdev/ci/ci-basic-overlay.sh3
-rwxr-xr-xdev/ci/ci-coquelicot.sh1
-rw-r--r--dev/ci/user-overlays/09854-vbgl-field_simplify_int.sh6
3 files changed, 2 insertions, 8 deletions
diff --git a/dev/ci/ci-basic-overlay.sh b/dev/ci/ci-basic-overlay.sh
index 4f5988c59c..d39b92467d 100755
--- a/dev/ci/ci-basic-overlay.sh
+++ b/dev/ci/ci-basic-overlay.sh
@@ -105,7 +105,8 @@
# Coquelicot
########################################################################
: "${coquelicot_CI_REF:=master}"
-: "${coquelicot_CI_GITURL:=https://scm.gforge.inria.fr/anonscm/git/coquelicot/coquelicot}"
+: "${coquelicot_CI_GITURL:=https://gitlab.inria.fr/coquelicot/coquelicot}"
+: "${coquelicot_CI_ARCHIVEURL:=${coquelicot_CI_GITURL}/-/archive}"
########################################################################
# CompCert
diff --git a/dev/ci/ci-coquelicot.sh b/dev/ci/ci-coquelicot.sh
index 33627fd8ef..6cb8dad604 100755
--- a/dev/ci/ci-coquelicot.sh
+++ b/dev/ci/ci-coquelicot.sh
@@ -5,7 +5,6 @@ ci_dir="$(dirname "$0")"
install_ssreflect
-FORCE_GIT=1
git_download coquelicot
( cd "${CI_BUILD_DIR}/coquelicot" && ./autogen.sh && ./configure && ./remake "-j${NJOBS}" )
diff --git a/dev/ci/user-overlays/09854-vbgl-field_simplify_int.sh b/dev/ci/user-overlays/09854-vbgl-field_simplify_int.sh
deleted file mode 100644
index 720adbc979..0000000000
--- a/dev/ci/user-overlays/09854-vbgl-field_simplify_int.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-if [ "$CI_PULL_REQUEST" = "9854" ] || [ "$CI_BRANCH" = "field_simplify_int" ]; then
-
- coquelicot_CI_REF=field_simplify_int
- coquelicot_CI_GITURL=https://gitlab.com/vbgl/coquelicot
-
-fi