summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Pickering <matthewtpickering@gmail.com>2023-01-14 16:18:33 +0000
committerMarge Bot <ben+marge-bot@smart-cactus.org>2023-01-16 20:51:25 -0500
commit4afb952c22a1ca4a4f02e3ca8bd743391d3a03d7 (patch)
tree1ba2c77eda311a5c5f1ba500895d5d2590248e67
parent6a5845fb6bb6fbf0deaf01ff20499da22d6471ca (diff)
downloadhaskell-4afb952c22a1ca4a4f02e3ca8bd743391d3a03d7.tar.gz
ci: Don't build aarch64-deb10-llvm job on release pipelines
Closes #22721
-rwxr-xr-x.gitlab/gen_ci.hs2
-rw-r--r--.gitlab/jobs.yaml60
2 files changed, 1 insertions, 61 deletions
diff --git a/.gitlab/gen_ci.hs b/.gitlab/gen_ci.hs
index 3bea08bd88..9e8130657f 100755
--- a/.gitlab/gen_ci.hs
+++ b/.gitlab/gen_ci.hs
@@ -823,7 +823,7 @@ jobs = Map.fromList $ concatMap (filter is_enabled_job . flattenJobGroup)
, allowFailureGroup (addValidateRule FreeBSDLabel (standardBuilds Amd64 FreeBSD13))
, standardBuilds AArch64 Darwin
, standardBuildsWithConfig AArch64 (Linux Debian10) (splitSectionsBroken vanilla)
- , disableValidate (standardBuildsWithConfig AArch64 (Linux Debian10) llvm)
+ , disableValidate (validateBuilds AArch64 (Linux Debian10) llvm)
, standardBuildsWithConfig I386 (Linux Debian9) (splitSectionsBroken vanilla)
, standardBuildsWithConfig Amd64 (Linux Alpine) (splitSectionsBroken static)
, disableValidate (allowFailureGroup (standardBuildsWithConfig Amd64 (Linux Alpine) staticNativeInt))
diff --git a/.gitlab/jobs.yaml b/.gitlab/jobs.yaml
index c6c943e971..ea3f4db040 100644
--- a/.gitlab/jobs.yaml
+++ b/.gitlab/jobs.yaml
@@ -2053,66 +2053,6 @@
"XZ_OPT": "-9"
}
},
- "release-aarch64-linux-deb10-release+llvm": {
- "after_script": [
- ".gitlab/ci.sh save_cache",
- ".gitlab/ci.sh clean",
- "cat ci_timings"
- ],
- "allow_failure": false,
- "artifacts": {
- "expire_in": "1 year",
- "paths": [
- "ghc-aarch64-linux-deb10-release+llvm.tar.xz",
- "junit.xml"
- ],
- "reports": {
- "junit": "junit.xml"
- },
- "when": "always"
- },
- "cache": {
- "key": "aarch64-linux-deb10-$CACHE_REV",
- "paths": [
- "cabal-cache",
- "toolchain"
- ]
- },
- "dependencies": [],
- "image": "registry.gitlab.haskell.org/ghc/ci-images/aarch64-linux-deb10:$DOCKER_REV",
- "needs": [
- {
- "artifacts": false,
- "job": "hadrian-ghc-in-ghci"
- }
- ],
- "rules": [
- {
- "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB == \"yes\") && ($NIGHTLY == null) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
- "when": "on_success"
- }
- ],
- "script": [
- "sudo chown ghc:ghc -R .",
- ".gitlab/ci.sh setup",
- ".gitlab/ci.sh configure",
- ".gitlab/ci.sh build_hadrian",
- ".gitlab/ci.sh test_hadrian"
- ],
- "stage": "full-build",
- "tags": [
- "aarch64-linux"
- ],
- "variables": {
- "BIGNUM_BACKEND": "gmp",
- "BIN_DIST_NAME": "ghc-aarch64-linux-deb10-release+llvm",
- "BUILD_FLAVOUR": "release+llvm",
- "CONFIGURE_ARGS": "",
- "IGNORE_PERF_FAILURES": "all",
- "TEST_ENV": "aarch64-linux-deb10-release+llvm",
- "XZ_OPT": "-9"
- }
- },
"release-aarch64-linux-deb10-release+no_split_sections": {
"after_script": [
".gitlab/ci.sh save_cache",