Commit b5199648 authored by Ralf Jung's avatar Ralf Jung

update CI

parent 9e19db28
......@@ -13,7 +13,7 @@ variables:
- fp-timing
script:
# prepare
- . build/opam-ci.sh coq "$COQ_VERSION"
- . build/opam-ci.sh $OPAM_PINS
- env | egrep '^(CI_BUILD_REF|CI_RUNNER)' > build-env.txt
# build
- 'time make -k -j$CPU_CORES TIMED=y 2>&1 | tee build-log.txt'
......@@ -41,17 +41,17 @@ opam:
build-coq.8.7.dev:
<<: *template
variables:
COQ_VERSION: "8.7.dev"
OPAM_PINS: "coq version 8.7.dev"
build-coq.8.7:
<<: *template
variables:
COQ_VERSION: "8.7.0"
OPAM_PINS: "coq version 8.7.0"
build-coq.8.6.1:
<<: *template
variables:
COQ_VERSION: "8.6.1"
OPAM_PINS: "coq version 8.6.1"
VALIDATE: "1"
artifacts:
paths:
......@@ -61,5 +61,5 @@ build-coq.8.6.1:
build-coq.8.6:
<<: *template
variables:
COQ_VERSION: "8.6"
OPAM_PINS: "coq version 8.6"
......@@ -47,14 +47,16 @@ echo
echo
while (( "$#" )); do # while there are arguments left
PACKAGE="$1" ; shift
KIND="$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"
read -a PIN <<< $(opam pin list | (egrep "^$PACKAGE[. ]"))
if [[ "${PIN[1]}" == "$KIND" && "${PIN[2]}" == "$VERSION" ]]; then
echo "[opam-ci] $PACKAGE already $KIND-pinned to $VERSION"
else
echo "[opam-ci] Pinning $PACKAGE to $VERSION"
run_and_print opam pin add -y -k version "$PACKAGE" "$VERSION"
echo "[opam-ci] $KIND-pinning $PACKAGE to $VERSION"
run_and_print opam pin add -y -k "$KIND" "$PACKAGE" "$VERSION"
fi
done
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment