Skip to content
Snippets Groups Projects
Commit 7f5389ab authored by Ralf Jung's avatar Ralf Jung
Browse files

update CI

parent 68ad3353
No related branches found
No related tags found
No related merge requests found
Pipeline #
Hide whitespace changes
Inline Side-by-side
.gitlab-ci.yml
+ 5
− 7
View file @ 7f5389ab
...@@ -8,7 +8,7 @@ variables: ...@@ -8,7 +8,7 @@ variables:
- fp-timing - fp-timing
script: script:
# prepare # prepare
- . build/opam-ci.sh coq "$COQ_VERSION" coq-mathcomp-ssreflect "$SSR_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'
...@@ -16,7 +16,7 @@ variables: ...@@ -16,7 +16,7 @@ variables:
- 'cat build-log.txt | egrep "[a-zA-Z0-9_/-]+ \((real|user): [0-9]" | tee build-time.txt' - 'cat build-log.txt | egrep "[a-zA-Z0-9_/-]+ \((real|user): [0-9]" | tee build-time.txt'
- 'if test -n "$VALIDATE" && (( RANDOM % 10 == 0 )); then make validate; fi' - 'if test -n "$VALIDATE" && (( RANDOM % 10 == 0 )); then make validate; fi'
cache: cache:
key: "coq.$COQ_VERSION-ssr.$SSR_VERSION" key: "$CI_JOB_NAME"
paths: paths:
- opamroot/ - opamroot/
only: only:
...@@ -26,15 +26,13 @@ variables: ...@@ -26,15 +26,13 @@ variables:
build-coq8.7: build-coq8.7:
<<: *template <<: *template
variables: variables:
COQ_VERSION: "8.7.dev" OPAM_PINS: "coq version 8.7.dev coq-mathcomp-ssreflect version dev"
SSR_VERSION: "dev"
build-coq8.6.1: build-coq8.6.1:
<<: *template <<: *template
variables: variables:
COQ_VERSION: "8.6.1" OPAM_PINS: "coq version 8.6.1 coq-mathcomp-ssreflect version 1.6.1"
SSR_VERSION: "1.6.1" # VALIDATE: "1" # coqchk on lambdaRust is currently broken, see Coq bug #5747
# VALIDATE: "1" # coqchk on lambdaRust is currently broken
artifacts: artifacts:
paths: paths:
- build-time.txt - build-time.txt
......
build/opam-ci.sh
+ 6
− 4
View file @ 7f5389ab
...@@ -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
......
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