diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2019-06-13 18:29:38 -0400 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2019-06-13 18:29:38 -0400 |
| commit | ec9abbced9d25099866e99e889637e9cd1faf9ba (patch) | |
| tree | 8235d7891276287285ac3e3317f8d50680e6b037 | |
| parent | b9ff33b97f2038592a9a1c9cbfadc8e0c97706da (diff) | |
| download | haskell-wip/reenable-jobs.tar.gz | |
gitlab-ci: Reenable llvm and deb9 jobs on master and release brancheswip/reenable-jobs
This should be a reasonable trade-off.
| -rw-r--r-- | .gitlab-ci.yml | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 032966b5e2..f99e8e88d8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -444,12 +444,16 @@ nightly-i386-linux-deb9: cache: key: linux-x86_64-deb9 -# Disabled to reduce CI load -.validate-x86_64-linux-deb9: +# Only runs on master and release branches to alleviate CI load +validate-x86_64-linux-deb9: extends: .build-x86_64-linux-deb9 artifacts: when: always expire_in: 2 week + only: + - master + - /ghc-[0-9]+\.[0-9]+/ + - tags nightly-x86_64-linux-deb9: extends: .build-x86_64-linux-deb9 @@ -473,13 +477,17 @@ validate-x86_64-linux-deb9-debug: when: always expire_in: 2 week -# Disabled to alleviate CI load -.validate-x86_64-linux-deb9-llvm: +# Only runs on master and release branches to alleviate CI load +validate-x86_64-linux-deb9-llvm: extends: .build-x86_64-linux-deb9 stage: full-build variables: BUILD_FLAVOUR: perf-llvm TEST_ENV: "x86_64-linux-deb9-llvm" + only: + - master + - /ghc-[0-9]+\.[0-9]+/ + - tags nightly-x86_64-linux-deb9-llvm: extends: .build-x86_64-linux-deb9 |