Commit e586fad6 authored by Ralf Jung's avatar Ralf Jung

test against released Coq 8.7; update CI

parent 8a0c449e
Pipeline #5111 passed with stage
in 1 minute and 44 seconds
image: ralfjung/opam-ci:latest image: ralfjung/opam-ci:latest
stages:
- build
variables: variables:
CPU_CORES: "9" CPU_CORES: "9"
.template: &template .template: &template
stage: build
tags: tags:
- fp-timing - fp-timing
script: script:
...@@ -23,17 +27,17 @@ variables: ...@@ -23,17 +27,17 @@ variables:
- master - master
- /^ci/ - /^ci/
build-coq.8.7: build-coq.8.7.0:
<<: *template <<: *template
variables: variables:
OPAM_PINS: "coq version 8.7.dev coq-mathcomp-ssreflect version dev" OPAM_PINS: "coq version 8.7.0 coq-mathcomp-ssreflect version 1.6.2"
except: except:
- triggers - triggers
build-coq.8.6.1: build-coq.8.6.1:
<<: *template <<: *template
variables: variables:
OPAM_PINS: "coq version 8.6.1 coq-mathcomp-ssreflect version 1.6.1" OPAM_PINS: "coq version 8.6.1 coq-mathcomp-ssreflect version 1.6.2"
VALIDATE: "1" VALIDATE: "1"
artifacts: artifacts:
paths: paths:
...@@ -45,6 +49,6 @@ build-coq.8.6.1: ...@@ -45,6 +49,6 @@ build-coq.8.6.1:
build-iris.dev: build-iris.dev:
<<: *template <<: *template
variables: variables:
OPAM_PINS: "coq version 8.6.1 coq-mathcomp-ssreflect version 1.6.1 coq-iris.dev git https://gitlab.mpi-sws.org/FP/iris-coq.git#$IRIS_REV" OPAM_PINS: "coq version 8.7.0 coq-mathcomp-ssreflect version 1.6.2 coq-iris.dev git https://gitlab.mpi-sws.org/FP/iris-coq.git#$IRIS_REV"
only: only:
- triggers - triggers
...@@ -6,8 +6,8 @@ Atomicity related verification based on Iris logic. ...@@ -6,8 +6,8 @@ Atomicity related verification based on Iris logic.
This version is known to compile with: This version is known to compile with:
- Coq 8.6.1 - Coq 8.6.1 / 8.7.0
- Ssreflect 1.6.1 - Ssreflect 1.6.2
- A development version of [Iris](https://gitlab.mpi-sws.org/FP/iris-coq/) - A development version of [Iris](https://gitlab.mpi-sws.org/FP/iris-coq/)
The easiest way to install the correct versions of the dependencies is through The easiest way to install the correct versions of the dependencies is through
......
#!/bin/bash #!/bin/bash
set -e set -e
set -x
## This script installs the build dependencies for CI builds. ## This script installs the build dependencies for CI builds.
function run_and_print() {
echo "$ $@"
"$@"
}
# Prepare OPAM configuration # Prepare OPAM configuration
export OPAMROOT="$(pwd)/opamroot" export OPAMROOT="$(pwd)/opamroot"
...@@ -12,32 +9,27 @@ export OPAMJOBS="$((2*$CPU_CORES))" ...@@ -12,32 +9,27 @@ export OPAMJOBS="$((2*$CPU_CORES))"
export OPAM_EDITOR="$(which false)" export OPAM_EDITOR="$(which false)"
# Make sure we got a good OPAM. # Make sure we got a good OPAM.
test -d "$OPAMROOT" || (mkdir "$OPAMROOT" && run_and_print opam init --no-setup -y) test -d "$OPAMROOT" || (mkdir "$OPAMROOT" && opam init --no-setup -y)
eval `opam conf env` eval `opam conf env`
# Make sure the pin for the builddep package is not stale. # Make sure the pin for the builddep package is not stale.
run_and_print make build-dep/opam make build-dep/opam
# Update repositories # Update repositories
if test $(find "$OPAMROOT/repo/package-index" -mtime +0); then opam update
# last update was more than a day ago
run_and_print opam update
else
# only update iris-dev, and only if it already exists
if test -d "$OPAMROOT/repo/iris-dev"; then run_and_print opam update iris-dev; fi
fi
# Make sure we got the right set of repositories registered # Make sure we got the right set of repositories registered
if echo "$@" | fgrep "dev"; then if echo "$@" | fgrep "dev" > /dev/null; then
# We are compiling against a dev version of something. Get ourselves the dev repositories. # We are compiling against a dev version of something. Get ourselves the dev repositories.
test -d "$OPAMROOT/repo/coq-extra-dev" || run_and_print opam repo add coq-extra-dev https://coq.inria.fr/opam/extra-dev -p 0 test -d "$OPAMROOT/repo/coq-extra-dev" || opam repo add coq-extra-dev https://coq.inria.fr/opam/extra-dev -p 0
test -d "$OPAMROOT/repo/coq-core-dev" || run_and_print opam repo add coq-core-dev https://coq.inria.fr/opam/core-dev -p 5 test -d "$OPAMROOT/repo/coq-core-dev" || opam repo add coq-core-dev https://coq.inria.fr/opam/core-dev -p 5
else else
# No dev version, make sure we do not have the dev repositories. # No dev version, make sure we do not have the dev repositories.
test -d "$OPAMROOT/repo/coq-extra-dev" && run_and_print opam repo remove coq-extra-dev test -d "$OPAMROOT/repo/coq-extra-dev" && opam repo remove coq-extra-dev
test -d "$OPAMROOT/repo/coq-core-dev" && run_and_print opam repo remove coq-core-dev test -d "$OPAMROOT/repo/coq-core-dev" && opam repo remove coq-core-dev
fi fi
test -d "$OPAMROOT/repo/coq-released" || run_and_print opam repo add coq-released https://coq.inria.fr/opam/released -p 10 test -d "$OPAMROOT/repo/coq-released" || opam repo add coq-released https://coq.inria.fr/opam/released -p 10
test -d "$OPAMROOT/repo/iris-dev" || run_and_print opam repo add iris-dev https://gitlab.mpi-sws.org/FP/opam-dev.git -p 20 test -d "$OPAMROOT/repo/iris-dev" || opam repo add iris-dev https://gitlab.mpi-sws.org/FP/opam-dev.git -p 20
echo echo
# We really want to run all of the following in one opam transaction, but due to opam limitations, # We really want to run all of the following in one opam transaction, but due to opam limitations,
...@@ -56,14 +48,14 @@ while (( "$#" )); do # while there are arguments left ...@@ -56,14 +48,14 @@ while (( "$#" )); do # while there are arguments left
echo "[opam-ci] $PACKAGE already $KIND-pinned to $VERSION" echo "[opam-ci] $PACKAGE already $KIND-pinned to $VERSION"
else else
echo "[opam-ci] $KIND-pinning $PACKAGE to $VERSION" echo "[opam-ci] $KIND-pinning $PACKAGE to $VERSION"
run_and_print opam pin add -y -k "$KIND" "$PACKAGE" "$VERSION" opam pin add -y -k "$KIND" "$PACKAGE" "$VERSION"
fi fi
done done
# Upgrade cached things. # Upgrade cached things.
echo echo
echo "[opam-ci] Upgrading opam" echo "[opam-ci] Upgrading opam"
run_and_print opam upgrade -y opam upgrade -y --fixup
# Install build-dependencies. # Install build-dependencies.
echo echo
......
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