Commit b5199648 authored by Ralf Jung's avatar Ralf Jung
Browse files

update CI

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