From 72528bbeb722bfc03f7ca65bd81ee40eb1d9a530 Mon Sep 17 00:00:00 2001
From: Ralf Jung <post@ralfj.de>
Date: Sat, 26 Aug 2017 14:27:44 +0200
Subject: [PATCH] update CI for directory layout
---
.gitlab-ci.yml | 9 ++++-----
build/opam-ci.sh | 1 -
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 87bd9a0f..580518d1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,13 +8,12 @@ variables:
- fp-timing
script:
# prepare
- - cd coq
- . build/opam-ci.sh coq "$COQ_VERSION" coq-mathcomp-ssreflect "$SSR_VERSION"
- 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'
- 'if fgrep Axiom build-log.txt >/dev/null; then exit 1; fi'
- - 'cat build-log.txt | egrep "[a-zA-Z0-9_/-]+ \(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'
cache:
key: "coq$COQ_VERSION-ssr$SSR_VERSION"
@@ -24,7 +23,7 @@ variables:
- master
- /^ci/
-gps-coq8.6.1:
+igps-coq8.6.1:
<<: *template
variables:
COQ_VERSION: "8.6.1"
@@ -32,5 +31,5 @@ gps-coq8.6.1:
VALIDATE: 1
artifacts:
paths:
- - coq/ra/build-time.txt
- - coq/ra/build-env.txt
+ - build-time.txt
+ - build-env.txt
diff --git a/build/opam-ci.sh b/build/opam-ci.sh
index 6c98d51b..20d87f9d 100755
--- a/build/opam-ci.sh
+++ b/build/opam-ci.sh
@@ -36,7 +36,6 @@ done
# Install build-dependencies
echo
-cd ra
make build-dep Y=1
# done
--
GitLab