[commit: ghc] master: Enable more GitLab CI ways (fec753d)
git at git.haskell.org
git at git.haskell.org
Thu Dec 13 04:27:24 UTC 2018
Repository : ssh://git@git.haskell.org/ghc
On branch : master
Link : http://ghc.haskell.org/trac/ghc/changeset/fec753d87e9da6c65b956b0fa3de897d1f80e8ab/ghc
>---------------------------------------------------------------
commit fec753d87e9da6c65b956b0fa3de897d1f80e8ab
Author: Ben Gamari <ben at smart-cactus.org>
Date: Tue Dec 11 20:12:10 2018 -0500
Enable more GitLab CI ways
But allow failure since CircleCI is still our source of truth.
>---------------------------------------------------------------
fec753d87e9da6c65b956b0fa3de897d1f80e8ab
.gitlab-ci.yml | 54 +++++++++++++++++++++++++++++++++++++++++++++---------
1 file changed, 45 insertions(+), 9 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a87af4c..967dafc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,7 +2,7 @@ variables:
GIT_SSL_NO_VERIFY: "1"
before_script:
- - python .gitlab/fix-submodules.py
+ - python3 .gitlab/fix-submodules.py
- git submodule sync --recursive
- git submodule update --init --recursive
- git checkout .gitmodules
@@ -12,20 +12,21 @@ before_script:
############################################################
.validate-hadrian:
+ allow_failure: true
script:
- bash .circleci/prepare-system.sh
- if [[ -d ./cabal-cache ]]; then cp -R ./.cabal-cache ~/.cabal-cache; fi
- ./boot
- - ./configure
+ - ./configure $CONFIGURE_ARGS
- hadrian/build.cabal.sh -j`mk/detect-cpu-count.sh`
cache:
key: hadrian
paths:
- cabal-cache
- image: ghcci/x86_64-linux-deb8:0.1
-.validate-x86_64-linux-hadrian:
+validate-x86_64-linux-deb8-hadrian:
extends: .validate-hadrian
+ image: ghcci/x86_64-linux-deb8:0.1
before_script:
# workaround for docker permissions
- sudo chown ghc:ghc -R .
@@ -37,10 +38,11 @@ before_script:
############################################################
.validate:
+ allow_failure: true
script:
- make clean || true
- ./boot
- - ./configure
+ - ./configure $CONFIGURE_ARGS
- |
THREADS=`mk/detect-cpu-count.sh`
make V=0 -j$THREADS
@@ -50,7 +52,6 @@ before_script:
- |
THREADS=`mk/detect-cpu-count.sh`
make test THREADS=$THREADS JUNIT_FILE=../../junit.xml
- image: ghcci/x86_64-linux-deb8:0.1
artifacts:
when: always
reports:
@@ -86,12 +87,13 @@ before_script:
- cabal-cache
- toolchain
-validate-x86_64-linux:
+
+.validate-linux:
extends: .validate
tags:
- x86_64-linux
before_script:
- - python .gitlab/fix-submodules.py
+ - python3 .gitlab/fix-submodules.py
- git submodule sync --recursive
- git submodule update --init --recursive
- git checkout .gitmodules
@@ -102,11 +104,45 @@ validate-x86_64-linux:
after_script:
- cp -Rf $HOME/.cabal cabal-cache
cache:
- key: darwin
+ key: linux
paths:
- cabal-cache
- toolchain
+validate-x86_64-linux-deb9:
+ extends: .validate-linux
+ image: ghcci/x86_64-linux-deb9:0.1
+ cache:
+ key: linux-x86_64-deb9
+
+validate-x86_64-linux-deb8:
+ extends: .validate-linux
+ image: ghcci/x86_64-linux-deb8:0.1
+ cache:
+ key: linux-x86_64-deb8
+
+validate-x86_64-linux-fedora27:
+ extends: .validate-linux
+ image: ghcci/x86_64-linux-fedora27:0.1
+ cache:
+ key: linux-x86_64-fedora27
+
+validate-x86_64-linux-deb9-integer-simple:
+ extends: .validate-linux
+ variables:
+ INTEGER_LIBRARY: integer-simple
+ image: ghcci/x86_64-linux-deb9:0.1
+ cache:
+ key: linux-x86_64-deb9
+
+validate-x86_64-linux-deb9-unreg:
+ extends: .validate-linux
+ variables:
+ CONFIGURE_ARGS: --enable-unregisterised
+ image: ghcci/x86_64-linux-deb9:0.1
+ cache:
+ key: linux-x86_64-deb9
+
############################################################
# Validation via Pipelines (make, Windows)
############################################################
More information about the ghc-commits
mailing list