diff options
Diffstat (limited to 'dev/ci')
| -rw-r--r-- | dev/ci/ci-common.sh | 8 | ||||
| -rwxr-xr-x | dev/ci/ci-iris-coq.sh | 15 |
2 files changed, 7 insertions, 16 deletions
diff --git a/dev/ci/ci-common.sh b/dev/ci/ci-common.sh index 9fdd2504d4..c94f150263 100644 --- a/dev/ci/ci-common.sh +++ b/dev/ci/ci-common.sh @@ -25,16 +25,12 @@ git_checkout() local _URL=${2} local _DEST=${3} - # Allow an optional 4th argument for the commit - local _COMMIT=${4:-FETCH_HEAD} - local _DEPTH=${5:-1} - mkdir -p ${_DEST} ( cd ${_DEST} && \ - if [ ! -d .git ] ; then git clone --depth ${_DEPTH} ${_URL} . ; fi && \ + if [ ! -d .git ] ; then git clone --depth 1 ${_URL} . ; fi && \ echo "Checking out ${_DEST}" && \ git fetch ${_URL} ${_BRANCH} && \ - git checkout ${_COMMIT} && \ + git checkout FETCH_HEAD && \ echo "${_DEST}: `git log -1 --format='%s | %H | %cd | %aN'`" ) } diff --git a/dev/ci/ci-iris-coq.sh b/dev/ci/ci-iris-coq.sh index dcb46ed2ab..eb1d1be078 100755 --- a/dev/ci/ci-iris-coq.sh +++ b/dev/ci/ci-iris-coq.sh @@ -9,19 +9,14 @@ Iris_CI_DIR=${CI_BUILD_DIR}/iris-coq install_ssreflect -# Setup Iris first, as it is needed to compute the dependencies - -git_checkout ${Iris_CI_BRANCH} ${Iris_CI_GITURL} ${Iris_CI_DIR} -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} ( cd ${stdpp_CI_DIR} && make -j ${NJOBS} && make install ) -# Build iris now +# Setup Iris + +git_checkout ${Iris_CI_BRANCH} ${Iris_CI_GITURL} ${Iris_CI_DIR} + ( cd ${Iris_CI_DIR} && make -j ${NJOBS} ) |