diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2020-10-19 16:49:09 -0400 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2020-11-24 02:43:55 -0500 |
| commit | 9b95d815d718ce671e9e87b8a2eb0534ed5688dd (patch) | |
| tree | c25e671c42bb298687792a0d54a7233b3a104b99 | |
| parent | 7c03cc5010999d0f0f9dfc549984023b3a1f2c8d (diff) | |
| download | haskell-9b95d815d718ce671e9e87b8a2eb0534ed5688dd.tar.gz | |
gitlab-ci: Run LLVM builds on Debian 10
The current Debian 9 image doesn't provide LLVM 7.
| -rw-r--r-- | .gitlab-ci.yml | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f8e1dc1f97..2b9d16f406 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -659,23 +659,6 @@ validate-x86_64-linux-deb9-debug: when: always expire_in: 2 week -validate-x86_64-linux-deb9-llvm: - extends: .build-x86_64-linux-deb9 - stage: full-build - rules: - - if: '$CI_MERGE_REQUEST_LABELS =~ /.*LLVM backend.*/' - variables: - BUILD_FLAVOUR: perf-llvm - TEST_ENV: "x86_64-linux-deb9-llvm" - -nightly-x86_64-linux-deb9-llvm: - <<: *nightly - extends: .build-x86_64-linux-deb9 - stage: full-build - variables: - BUILD_FLAVOUR: perf-llvm - TEST_ENV: "x86_64-linux-deb9-llvm" - validate-x86_64-linux-deb9-integer-simple: extends: .build-x86_64-linux-deb9 stage: full-build @@ -760,6 +743,23 @@ release-x86_64-linux-deb10-dwarf: TEST_ENV: "x86_64-linux-deb10-dwarf" BIN_DIST_PREP_TAR_COMP: "ghc-x86_64-deb10-linux-dwarf.tar.xz" +validate-x86_64-linux-deb10-llvm: + extends: .build-x86_64-linux-deb10 + stage: full-build + rules: + - if: '$CI_MERGE_REQUEST_LABELS =~ /.*LLVM backend.*/' + variables: + BUILD_FLAVOUR: perf-llvm + TEST_ENV: "x86_64-linux-deb10-llvm" + +nightly-x86_64-linux-deb10-llvm: + <<: *nightly + extends: .build-x86_64-linux-deb10 + stage: full-build + variables: + BUILD_FLAVOUR: perf-llvm + TEST_ENV: "x86_64-linux-deb10-llvm" + ################################# # x86_64-linux-ubuntu 20.04 ################################# |