diff --git a/.gitlab/gen_ci.hs b/.gitlab/gen_ci.hs index b9c809b2718bc08476d9ff6e68541cb254849a51..1900f3ffe53cf3cd4cfe0baef05d02afdb0a0dd9 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 53f689bcdf85b11491e61e777d631eebe8e3946c..c9fa50333e13462c45b8306a1658772a7167ea40 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" } },