From f1930877e20379e11c4d6b79283980a4253c178d Mon Sep 17 00:00:00 2001
From: Vincent Laporte
Date: Mon, 1 Apr 2019 09:16:08 +0000
Subject: [CI] Coquelicot: use “master” development version

---
 dev/ci/ci-basic-overlay.sh | 11 ++---------
 dev/ci/ci-coquelicot.sh    |  4 ++--
 2 files changed, 4 insertions(+), 11 deletions(-)

(limited to 'dev/ci')

diff --git a/dev/ci/ci-basic-overlay.sh b/dev/ci/ci-basic-overlay.sh
index 33a86d7027..0c89809ee9 100755
--- a/dev/ci/ci-basic-overlay.sh
+++ b/dev/ci/ci-basic-overlay.sh
@@ -104,15 +104,8 @@
 ########################################################################
 # Coquelicot
 ########################################################################
-# The URL for downloading a tgz snapshot of the master branch is
-# https://scm.gforge.inria.fr/anonscm/gitweb?p=coquelicot/coquelicot.git;a=snapshot;h=refs/heads/master;sf=tgz
-# See https://gforge.inria.fr/scm/browser.php?group_id=3599
-# Since this URL doesn't fit to our standard mechanism and since Coquelicot doesn't seem to change frequently,
-# we use a fixed version, which has a download path which does fit to our standard mechanism.
-# ATTENTION: The archive URL might depend on the version!
-: "${Coquelicot_CI_REF:=coquelicot-3.0.2}"
-: "${Coquelicot_CI_GITURL:=https://scm.gforge.inria.fr/anonscm/git/coquelicot/coquelicot}"
-: "${Coquelicot_CI_ARCHIVEURL:=https://gforge.inria.fr/frs/download.php/file/37523}"
+: "${coquelicot_CI_REF:=master}"
+: "${coquelicot_CI_GITURL:=https://scm.gforge.inria.fr/anonscm/git/coquelicot/coquelicot}"
 
 ########################################################################
 # CompCert
diff --git a/dev/ci/ci-coquelicot.sh b/dev/ci/ci-coquelicot.sh
index 5d8817491d..33627fd8ef 100755
--- a/dev/ci/ci-coquelicot.sh
+++ b/dev/ci/ci-coquelicot.sh
@@ -6,6 +6,6 @@ ci_dir="$(dirname "$0")"
 install_ssreflect
 
 FORCE_GIT=1
-git_download Coquelicot
+git_download coquelicot
 
-( cd "${CI_BUILD_DIR}/Coquelicot" && ./autogen.sh && ./configure && ./remake "-j${NJOBS}" )
+( cd "${CI_BUILD_DIR}/coquelicot" && ./autogen.sh && ./configure && ./remake "-j${NJOBS}" )
-- 
cgit v1.2.3


From 4d50b90cb4e78c9e5e0bb5395ffb6c13ae72c1b1 Mon Sep 17 00:00:00 2001
From: Vincent Laporte
Date: Mon, 1 Apr 2019 09:23:19 +0000
Subject: [CI] Disable Coquelicot on Windows

---
 dev/ci/gitlab.bat | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'dev/ci')

diff --git a/dev/ci/gitlab.bat b/dev/ci/gitlab.bat
index 5f819f31f9..cc1931d13d 100755
--- a/dev/ci/gitlab.bat
+++ b/dev/ci/gitlab.bat
@@ -49,9 +49,9 @@ IF "%WINDOWS%" == "enabled_all_addons" (
     -addon=compcert ^
     -addon=extlib ^
     -addon=quickchick ^
-    -addon=coquelicot ^
     -addon=vst ^
     -addon=aactactics
+REM -addon=coquelicot ^
 ) ELSE (
   SET "EXTRA_ADDONS= "
 )
-- 
cgit v1.2.3