From e82881f643d23d945aa0a4e2ce6172878f7c1412 Mon Sep 17 00:00:00 2001
From: Emilio Jesus Gallego Arias <e+git@x80.org>
Date: Fri, 24 Mar 2017 15:47:36 +0100
Subject: [travis] Backport from trunk: VST

---
 .travis.yml                |  2 ++
 Makefile.ci                |  2 +-
 dev/ci/ci-basic-overlay.sh |  9 +++++++++
 dev/ci/ci-common.sh        |  4 ++--
 dev/ci/ci-iris-coq.sh      |  3 +--
 dev/ci/ci-vst.sh           | 13 +++++++++++++
 6 files changed, 28 insertions(+), 5 deletions(-)
 create mode 100755 dev/ci/ci-vst.sh

diff --git a/.travis.yml b/.travis.yml
index 7138d5c61..81f50af0a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -40,6 +40,7 @@ env:
   - TEST_TARGET="ci-math-comp"
   - TEST_TARGET="ci-sf"
   - TEST_TARGET="ci-unimath"
+  - TEST_TARGET="ci-vst"
   # Not ready yet for 8.7
   # - TEST_TARGET="ci-cpdt"
   # - TEST_TARGET="ci-metacoq"
@@ -49,6 +50,7 @@ matrix:
 
   allow_failures:
   - env: TEST_TARGET="ci-geocoq"
+  - env: TEST_TARGET="ci-vst"
 
   # Full Coq test-suite with two compilers
   # [TODO: use yaml refs and avoid duplication for packages list]
diff --git a/Makefile.ci b/Makefile.ci
index 897318c4d..b055ada8e 100644
--- a/Makefile.ci
+++ b/Makefile.ci
@@ -1,7 +1,7 @@
 CI_TARGETS=ci-all ci-hott ci-math-comp ci-compcert ci-sf ci-cpdt \
            ci-color ci-math-classes ci-tlc ci-fiat-crypto ci-fiat-parsers \
            ci-coquelicot ci-flocq ci-iris-coq ci-metacoq ci-geocoq \
-           ci-unimath
+           ci-unimath ci-vst
 
 .PHONY: $(CI_TARGETS)
 
diff --git a/dev/ci/ci-basic-overlay.sh b/dev/ci/ci-basic-overlay.sh
index 241ec3586..336ce9d8f 100644
--- a/dev/ci/ci-basic-overlay.sh
+++ b/dev/ci/ci-basic-overlay.sh
@@ -46,8 +46,11 @@
 ########################################################################
 # HoTT
 ########################################################################
+# Temporal overlay
 : ${HoTT_CI_BRANCH:=mz-8.7}
 : ${HoTT_CI_GITURL:=https://github.com/ejgallego/HoTT.git}
+# : ${HoTT_CI_BRANCH:=master}
+# : ${HoTT_CI_GITURL:=https://github.com/HoTT/HoTT.git}
 
 ########################################################################
 # GeoCoq
@@ -73,6 +76,12 @@
 : ${CompCert_CI_BRANCH:=master}
 : ${CompCert_CI_GITURL:=https://github.com/AbsInt/CompCert.git}
 
+########################################################################
+# VST
+########################################################################
+: ${VST_CI_BRANCH:=master}
+: ${VST_CI_GITURL:=https://github.com/PrincetonUniversity/VST.git}
+
 ########################################################################
 # fiat_parsers
 ########################################################################
diff --git a/dev/ci/ci-common.sh b/dev/ci/ci-common.sh
index 9fdd2504d..2711b7eca 100644
--- a/dev/ci/ci-common.sh
+++ b/dev/ci/ci-common.sh
@@ -27,11 +27,11 @@ git_checkout()
 
   # Allow an optional 4th argument for the commit
   local _COMMIT=${4:-FETCH_HEAD}
-  local _DEPTH=${5:-1}
+  local _DEPTH=$(if [ -z "${4}" ]; then echo "--depth 1"; fi)
 
   mkdir -p ${_DEST}
   ( cd ${_DEST}                                                && \
-    if [ ! -d .git ] ; then git clone --depth ${_DEPTH} ${_URL} . ; fi && \
+    if [ ! -d .git ] ; then git clone ${_DEPTH} ${_URL} . ; fi && \
     echo "Checking out ${_DEST}"                               && \
     git fetch ${_URL} ${_BRANCH}                               && \
     git checkout ${_COMMIT}                                    && \
diff --git a/dev/ci/ci-iris-coq.sh b/dev/ci/ci-iris-coq.sh
index dcb46ed2a..262dd6fa0 100755
--- a/dev/ci/ci-iris-coq.sh
+++ b/dev/ci/ci-iris-coq.sh
@@ -17,9 +17,8 @@ read -a IRIS_DEP < ${Iris_CI_DIR}/opam.pins
 # Setup stdpp
 stdpp_CI_GITURL=${IRIS_DEP[1]}.git
 stdpp_CI_COMMIT=${IRIS_DEP[2]}
-stdpp_CI_DEPTH="1000"
 
-git_checkout ${stdpp_CI_BRANCH} ${stdpp_CI_GITURL} ${stdpp_CI_DIR} ${stdpp_CI_COMMIT} ${stdpp_CI_DEPTH}
+git_checkout ${stdpp_CI_BRANCH} ${stdpp_CI_GITURL} ${stdpp_CI_DIR} ${stdpp_CI_COMMIT}
 
 ( cd ${stdpp_CI_DIR} && make -j ${NJOBS} && make install )
 
diff --git a/dev/ci/ci-vst.sh b/dev/ci/ci-vst.sh
new file mode 100755
index 000000000..c11195185
--- /dev/null
+++ b/dev/ci/ci-vst.sh
@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+
+ci_dir="$(dirname "$0")"
+source ${ci_dir}/ci-common.sh
+
+VST_CI_DIR=${CI_BUILD_DIR}/VST
+
+# opam install -j ${NJOBS} -y menhir
+git_checkout ${VST_CI_BRANCH} ${VST_CI_GITURL} ${VST_CI_DIR}
+
+# Targets are: msl veric floyd
+# Patch to avoid the upper version limit
+( cd ${VST_CI_DIR} && sed -i.bak 's/8.6$/8.6 or-else trunk/' Makefile && make -j ${NJOBS} )
-- 
cgit v1.2.3