diff options
Diffstat (limited to '.gitlab')
-rwxr-xr-x | .gitlab/gen_ci.hs | 2 | ||||
-rw-r--r-- | .gitlab/jobs.yaml | 20 |
2 files changed, 11 insertions, 11 deletions
diff --git a/.gitlab/gen_ci.hs b/.gitlab/gen_ci.hs index d7a644a22d..c06c1c8463 100755 --- a/.gitlab/gen_ci.hs +++ b/.gitlab/gen_ci.hs @@ -813,7 +813,7 @@ jobs = Map.fromList $ concatMap flattenJobGroup $ , standardBuilds Amd64 Darwin , allowFailureGroup (addValidateRule FreeBSDLabel (standardBuilds Amd64 FreeBSD13)) , standardBuilds AArch64 Darwin - , standardBuilds AArch64 (Linux Debian10) + , standardBuildsWithConfig AArch64 (Linux Debian10) (splitSectionsBroken vanilla) , disableValidate (standardBuildsWithConfig AArch64 (Linux Debian10) llvm) , standardBuildsWithConfig I386 (Linux Debian9) (splitSectionsBroken vanilla) , standardBuildsWithConfig Amd64 (Linux Alpine) (splitSectionsBroken static) diff --git a/.gitlab/jobs.yaml b/.gitlab/jobs.yaml index c0a51664b4..c8fe55a71b 100644 --- a/.gitlab/jobs.yaml +++ b/.gitlab/jobs.yaml @@ -1926,7 +1926,7 @@ "XZ_OPT": "-9" } }, - "release-aarch64-linux-deb10-release": { + "release-aarch64-linux-deb10-release+llvm": { "after_script": [ ".gitlab/ci.sh save_cache", ".gitlab/ci.sh clean", @@ -1936,7 +1936,7 @@ "artifacts": { "expire_in": "1 year", "paths": [ - "ghc-aarch64-linux-deb10-release.tar.xz", + "ghc-aarch64-linux-deb10-release+llvm.tar.xz", "junit.xml" ], "reports": { @@ -1978,15 +1978,15 @@ ], "variables": { "BIGNUM_BACKEND": "gmp", - "BIN_DIST_NAME": "ghc-aarch64-linux-deb10-release", - "BUILD_FLAVOUR": "release", + "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", + "TEST_ENV": "aarch64-linux-deb10-release+llvm", "XZ_OPT": "-9" } }, - "release-aarch64-linux-deb10-release+llvm": { + "release-aarch64-linux-deb10-release+no_split_sections": { "after_script": [ ".gitlab/ci.sh save_cache", ".gitlab/ci.sh clean", @@ -1996,7 +1996,7 @@ "artifacts": { "expire_in": "1 year", "paths": [ - "ghc-aarch64-linux-deb10-release+llvm.tar.xz", + "ghc-aarch64-linux-deb10-release+no_split_sections.tar.xz", "junit.xml" ], "reports": { @@ -2038,11 +2038,11 @@ ], "variables": { "BIGNUM_BACKEND": "gmp", - "BIN_DIST_NAME": "ghc-aarch64-linux-deb10-release+llvm", - "BUILD_FLAVOUR": "release+llvm", + "BIN_DIST_NAME": "ghc-aarch64-linux-deb10-release+no_split_sections", + "BUILD_FLAVOUR": "release+no_split_sections", "CONFIGURE_ARGS": "", "IGNORE_PERF_FAILURES": "all", - "TEST_ENV": "aarch64-linux-deb10-release+llvm", + "TEST_ENV": "aarch64-linux-deb10-release+no_split_sections", "XZ_OPT": "-9" } }, |