From 5a475f3aaf171c0fa19245c7c44e708dcfc0856d Mon Sep 17 00:00:00 2001
From: Ralf Jung <jung@mpi-sws.org>
Date: Fri, 13 Jan 2017 17:51:35 +0100
Subject: [PATCH] opam-ci: avoid re-downloading already properly pinned
packages
---
.gitlab-ci.yml | 2 +-
build/opam-ci.sh | 15 ++++++++++-----
2 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index aecbae62..bbdfe974 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,7 +3,7 @@ image: ralfjung/opam-ci:latest
lrust-coq8.6:
script:
# prepare
- - . build/opam-ci.sh 'coq 8.6' 'coq-mathcomp-ssreflect 1.6.1'
+ - . build/opam-ci.sh coq 8.6 coq-mathcomp-ssreflect 1.6.1
# build
- 'time make -j8 TIMED=y 2>&1 | tee build-log.txt'
- 'if fgrep Axiom build-log.txt >/dev/null; then exit 1; fi'
diff --git a/build/opam-ci.sh b/build/opam-ci.sh
index e9525736..c4189bab 100755
--- a/build/opam-ci.sh
+++ b/build/opam-ci.sh
@@ -14,14 +14,19 @@ test -d "$OPAMROOT/repo/coq-extra-dev" || opam repo add coq-extra-dev https://co
test -d "$OPAMROOT/repo/coq-core-dev" || opam repo add coq-core-dev https://coq.inria.fr/opam/core-dev -p 5
test -d "$OPAMROOT/repo/coq-released" || opam repo add coq-released https://coq.inria.fr/opam/released -p 10
opam update
-opam install ocamlfind -y # Remove this once the Coq crew fixed their package...
# Install fixed versions of some dependencies
echo
-for PIN in "${@}"
-do
- echo "Applying pin: $PIN"
- opam pin add $PIN -k version -y
+while (( "$#" )); do # while there are arguments left
+ PACKAGE="$1" ; shift
+ VERSION="$1" ; shift
+ # Check if the pin is already set
+ if opam pin list | fgrep "$PACKAGE.$VERSION " > /dev/null; then
+ echo "[opam-ci] $PACKAGE already pinned to $VERSION"
+ else
+ echo "[opam-ci] Pinning $PACKAGE to $VERSION"
+ opam pin add "$PACKAGE" "$VERSION" -k version -y
+ fi
done
# Install build-dependencies
--
GitLab