Commit 842e85c0 authored by Ralf Jung's avatar Ralf Jung

CI: tweaks

parent 01b8c312
...@@ -21,7 +21,7 @@ variables: ...@@ -21,7 +21,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: "coq.$COQ_VERSION-ssr.$SSR_VERSION"
paths: paths:
- opamroot/ - opamroot/
only: only:
......
...@@ -26,8 +26,8 @@ build-dep: phony ...@@ -26,8 +26,8 @@ build-dep: phony
mkdir -p build-dep mkdir -p build-dep
@sed <opam 's/^\(build\|install\|remove\):.*/\1: []/; s/^name: *"\(.*\)" */name: "\1-builddep"/' > build-dep/opam @sed <opam 's/^\(build\|install\|remove\):.*/\1: []/; s/^name: *"\(.*\)" */name: "\1-builddep"/' > build-dep/opam
@fgrep builddep build-dep/opam >/dev/null || (echo "sed failed to fix the package name" && exit 1) # sanity check @fgrep builddep build-dep/opam >/dev/null || (echo "sed failed to fix the package name" && exit 1) # sanity check
@# Compute the package name, add the pin and (re)install it. Reinstallation is needed # Compute the package name, add the pin and (re)install it.
@# in case the pin already exists, but the builddep package changed. @# Reinstallation is needed in case the pin already exists, but the builddep package changed.
@BUILD_DEP_PACKAGE="$$(egrep "^name:" build-dep/opam | sed 's/^name: *"\(.*\)" */\1/')"; \ @BUILD_DEP_PACKAGE="$$(egrep "^name:" build-dep/opam | sed 's/^name: *"\(.*\)" */\1/')"; \
opam pin add "$$BUILD_DEP_PACKAGE" "$$(pwd)/build-dep" -k path $(OPAMFLAGS) && \ opam pin add "$$BUILD_DEP_PACKAGE" "$$(pwd)/build-dep" -k path $(OPAMFLAGS) && \
opam reinstall "$$BUILD_DEP_PACKAGE" opam reinstall "$$BUILD_DEP_PACKAGE"
......
#!/bin/bash #!/bin/bash
set -e set -e
# This script installs the build dependencies for CI builds. ## This script installs the build dependencies for CI builds.
# Prepare OPAM configuration # Prepare OPAM configuration
export OPAMROOT="$(pwd)/opamroot" export OPAMROOT="$(pwd)/opamroot"
...@@ -44,10 +44,12 @@ while (( "$#" )); do # while there are arguments left ...@@ -44,10 +44,12 @@ while (( "$#" )); do # while there are arguments left
done done
# Upgrade cached things. # Upgrade cached things.
echo "[opam-ci] Upgrading opam"
opam upgrade -y opam upgrade -y
# Install build-dependencies. # Install build-dependencies.
echo echo
echo "[opam-ci] Installing build-dependencies"
make build-dep OPAMFLAGS=-y make build-dep OPAMFLAGS=-y
# done # 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