[Git][ghc/ghc][wip/marge_bot_batch_merge_job] 4 commits: rel-eng: update alpine images to 3.22
Marge Bot pushed to branch wip/marge_bot_batch_merge_job at Glasgow Haskell Compiler / GHC Commits: d17257ed by Cheng Shao at 2025-09-10T17:01:27+02:00 rel-eng: update alpine images to 3.22 This patch is a part of #25876 and updates alpine images to 3.22, while still retaining 3.12 for x86_64 fully_static bindists. ------------------------- Metric Decrease: MultiComponentModulesRecomp ------------------------- - - - - - 87f023d1 by Sylvain Henry at 2025-09-11T05:45:47-04:00 T16180: indicate that the stack isn't executable - - - - - aae72daa by Sylvain Henry at 2025-09-11T05:45:47-04:00 Fix some tests (statically linked GHC vs libc) When GHC is linked statically, the stdout C global variable that GHC uses isn't shared with the stdout C global variable used by loaded code. As a consequence, the latter must be explicitly flushed because GHC won't flush it before exiting. - - - - - ad49856a by Sylvain Henry at 2025-09-11T05:45:53-04:00 Testsuite: fix debug_rts detection Running the testsuite without Hadrian should set config.debug_rts correctly too. - - - - - 13 changed files: - .gitlab-ci.yml - .gitlab/generate-ci/gen_ci.hs - .gitlab/jobs.yaml - .gitlab/rel_eng/fetch-gitlab-artifacts/fetch_gitlab.py - .gitlab/rel_eng/mk-ghcup-metadata/mk_ghcup_metadata.py - testsuite/mk/test.mk - testsuite/tests/ffi/should_run/T1288_c.c - testsuite/tests/ffi/should_run/T1288_ghci_c.c - testsuite/tests/ffi/should_run/T2276_c.c - testsuite/tests/ffi/should_run/T2276_ghci_c.c - testsuite/tests/ghci/scripts/T7388.hs - testsuite/tests/ghci/scripts/T7388.script - testsuite/tests/th/T16180.hs Changes: ===================================== .gitlab-ci.yml ===================================== @@ -2,7 +2,7 @@ variables: GIT_SSL_NO_VERIFY: "1" # Commit of ghc/ci-images repository from which to pull Docker images - DOCKER_REV: 3618852f42dc1d3d8552fd2b173c482170f76ba6 + DOCKER_REV: be4ac2cd18f38e63b263e2a27c76a7c279385796 # Sequential version number of all cached things. # Bump to invalidate GitLab CI cache. @@ -1080,29 +1080,29 @@ abi-test: ghc-wasm-meta-gmp: extends: .ghc-wasm-meta needs: - - job: x86_64-linux-alpine3_20-wasm-cross_wasm32-wasi-release+host_fully_static+text_simdutf + - job: x86_64-linux-alpine3_22-wasm-cross_wasm32-wasi-release+host_fully_static+text_simdutf artifacts: false variables: UPSTREAM_GHC_FLAVOUR: gmp - UPSTREAM_GHC_JOB_NAME: x86_64-linux-alpine3_20-wasm-cross_wasm32-wasi-release+host_fully_static+text_simdutf + UPSTREAM_GHC_JOB_NAME: x86_64-linux-alpine3_22-wasm-cross_wasm32-wasi-release+host_fully_static+text_simdutf ghc-wasm-meta-native: extends: .ghc-wasm-meta needs: - - job: x86_64-linux-alpine3_20-wasm-int_native-cross_wasm32-wasi-release+host_fully_static+text_simdutf + - job: x86_64-linux-alpine3_22-wasm-int_native-cross_wasm32-wasi-release+host_fully_static+text_simdutf artifacts: false variables: UPSTREAM_GHC_FLAVOUR: native - UPSTREAM_GHC_JOB_NAME: x86_64-linux-alpine3_20-wasm-int_native-cross_wasm32-wasi-release+host_fully_static+text_simdutf + UPSTREAM_GHC_JOB_NAME: x86_64-linux-alpine3_22-wasm-int_native-cross_wasm32-wasi-release+host_fully_static+text_simdutf ghc-wasm-meta-unreg: extends: .ghc-wasm-meta needs: - - job: x86_64-linux-alpine3_20-wasm-unreg-cross_wasm32-wasi-release+host_fully_static+text_simdutf + - job: x86_64-linux-alpine3_22-wasm-unreg-cross_wasm32-wasi-release+host_fully_static+text_simdutf artifacts: false variables: UPSTREAM_GHC_FLAVOUR: unreg - UPSTREAM_GHC_JOB_NAME: x86_64-linux-alpine3_20-wasm-unreg-cross_wasm32-wasi-release+host_fully_static+text_simdutf + UPSTREAM_GHC_JOB_NAME: x86_64-linux-alpine3_22-wasm-unreg-cross_wasm32-wasi-release+host_fully_static+text_simdutf ############################################################ # Documentation deployment via GitLab Pages @@ -1218,9 +1218,7 @@ ghcup-metadata-nightly: artifacts: false - job: nightly-x86_64-windows-validate artifacts: false - - job: nightly-x86_64-linux-alpine3_12-validate - artifacts: false - - job: nightly-x86_64-linux-alpine3_20-validate + - job: nightly-x86_64-linux-alpine3_22-validate artifacts: false - job: nightly-x86_64-linux-deb9-validate artifacts: false @@ -1228,6 +1226,8 @@ ghcup-metadata-nightly: artifacts: false - job: nightly-i386-linux-deb12-validate artifacts: false + - job: nightly-i386-linux-alpine3_22-validate + artifacts: false - job: nightly-x86_64-linux-deb10-validate artifacts: false - job: nightly-aarch64-linux-deb10-validate @@ -1238,7 +1238,7 @@ ghcup-metadata-nightly: artifacts: false - job: nightly-aarch64-linux-deb12-validate artifacts: false - - job: nightly-aarch64-linux-alpine3_18-validate + - job: nightly-aarch64-linux-alpine3_22-validate artifacts: false - job: source-tarball artifacts: false ===================================== .gitlab/generate-ci/gen_ci.hs ===================================== @@ -126,8 +126,7 @@ data LinuxDistro | Ubuntu2004 | Ubuntu1804 | Alpine312 - | Alpine318 - | Alpine320 + | Alpine322 | AlpineWasm | Rocky8 deriving (Eq) @@ -328,9 +327,8 @@ distroName Ubuntu2004 = "ubuntu20_04" distroName Ubuntu2204 = "ubuntu22_04" distroName Ubuntu2404 = "ubuntu24_04" distroName Alpine312 = "alpine3_12" -distroName Alpine318 = "alpine3_18" -distroName Alpine320 = "alpine3_20" -distroName AlpineWasm = "alpine3_20-wasm" +distroName Alpine322 = "alpine3_22" +distroName AlpineWasm = "alpine3_22-wasm" distroName Rocky8 = "rocky8" opsysName :: Opsys -> String @@ -502,8 +500,7 @@ alpineVariables arch = mconcat $ distroVariables :: Arch -> LinuxDistro -> Variables distroVariables arch Alpine312 = alpineVariables arch -distroVariables arch Alpine318 = alpineVariables arch -distroVariables arch Alpine320 = alpineVariables arch +distroVariables arch Alpine322 = alpineVariables arch distroVariables _ Fedora33 = mconcat -- LLC/OPT do not work for some reason in our fedora images -- These tests fail with this error: T11649 T5681 T7571 T8131b @@ -1244,9 +1241,8 @@ alpine_x86 = fullyStaticBrokenTests (standardBuildsWithConfig Amd64 (Linux Alpine312) (splitSectionsBroken static)) , fullyStaticBrokenTests (disableValidate (allowFailureGroup (standardBuildsWithConfig Amd64 (Linux Alpine312) staticNativeInt))) -- Dynamically linked build, suitable for building your own static executables on alpine - , disableValidate (standardBuildsWithConfig Amd64 (Linux Alpine312) (splitSectionsBroken vanilla)) - , disableValidate (standardBuildsWithConfig Amd64 (Linux Alpine320) (splitSectionsBroken vanilla)) - , allowFailureGroup (standardBuildsWithConfig I386 (Linux Alpine320) (splitSectionsBroken vanilla)) + , disableValidate (standardBuildsWithConfig Amd64 (Linux Alpine322) (splitSectionsBroken vanilla)) + , allowFailureGroup (standardBuildsWithConfig I386 (Linux Alpine322) (splitSectionsBroken vanilla)) ] where -- ghcilink002 broken due to #17869 @@ -1257,7 +1253,7 @@ alpine_x86 = alpine_aarch64 :: [JobGroup Job] alpine_aarch64 = [ - disableValidate (standardBuildsWithConfig AArch64 (Linux Alpine318) (splitSectionsBroken vanilla)) + disableValidate (standardBuildsWithConfig AArch64 (Linux Alpine322) (splitSectionsBroken vanilla)) ] cross_jobs :: [JobGroup Job] @@ -1375,7 +1371,7 @@ mkPlatform arch opsys = archName arch <> "-" <> opsysName opsys platform_mapping :: Map String (JobGroup BindistInfo) platform_mapping = Map.map go combined_result where - whitelist = [ "x86_64-linux-alpine3_12-validate" + whitelist = [ "x86_64-linux-alpine3_12-validate+fully_static" , "x86_64-linux-deb11-validate" , "x86_64-linux-deb12-validate" , "x86_64-linux-deb10-validate+debug_info" @@ -1384,19 +1380,19 @@ platform_mapping = Map.map go combined_result , "x86_64-windows-validate" , "aarch64-linux-deb12-validate" , "aarch64-linux-deb12-wine-int_native-cross_aarch64-unknown-mingw32-validate" - , "nightly-x86_64-linux-alpine3_20-wasm-cross_wasm32-wasi-release+host_fully_static+text_simdutf" + , "nightly-x86_64-linux-alpine3_22-wasm-cross_wasm32-wasi-release+host_fully_static+text_simdutf" , "nightly-x86_64-linux-deb11-validate" , "nightly-x86_64-linux-deb12-validate" - , "x86_64-linux-alpine3_20-wasm-cross_wasm32-wasi-release+host_fully_static+text_simdutf" + , "x86_64-linux-alpine3_22-wasm-cross_wasm32-wasi-release+host_fully_static+text_simdutf" , "x86_64-linux-deb12-validate+thread_sanitizer_cmm" , "nightly-aarch64-linux-deb10-validate" , "nightly-aarch64-linux-deb12-validate" , "nightly-aarch64-linux-deb12-wine-int_native-cross_aarch64-unknown-mingw32-validate" - , "nightly-x86_64-linux-alpine3_12-validate" + , "nightly-x86_64-linux-alpine3_12-validate+fully_static" , "nightly-x86_64-linux-deb10-validate" , "nightly-x86_64-linux-fedora33-release" , "nightly-x86_64-windows-validate" - , "release-x86_64-linux-alpine3_12-release+no_split_sections" + , "release-x86_64-linux-alpine3_12-release+fully_static+no_split_sections" , "release-x86_64-linux-deb10-release" , "release-x86_64-linux-deb11-release" , "release-x86_64-linux-deb12-release" ===================================== .gitlab/jobs.yaml ===================================== @@ -66,7 +66,7 @@ "TEST_ENV": "aarch64-darwin-validate" } }, - "aarch64-linux-alpine3_18-validate": { + "aarch64-linux-alpine3_22-validate": { "after_script": [ ".gitlab/ci.sh save_cache", ".gitlab/ci.sh save_test_output", @@ -77,7 +77,7 @@ "artifacts": { "expire_in": "2 weeks", "paths": [ - "ghc-aarch64-linux-alpine3_18-validate.tar.xz", + "ghc-aarch64-linux-alpine3_22-validate.tar.xz", "junit.xml", "unexpected-test-output.tar.gz" ], @@ -87,14 +87,14 @@ "when": "always" }, "cache": { - "key": "aarch64-linux-alpine3_18-$CACHE_REV", + "key": "aarch64-linux-alpine3_22-$CACHE_REV", "paths": [ "cabal-cache", "toolchain" ] }, "dependencies": [], - "image": "registry.gitlab.haskell.org/ghc/ci-images/aarch64-linux-alpine3_18:$DOCKER_REV", + "image": "registry.gitlab.haskell.org/ghc/ci-images/aarch64-linux-alpine3_22:$DOCKER_REV", "needs": [ { "artifacts": false, @@ -103,7 +103,7 @@ ], "rules": [ { - "if": "((($ONLY_JOBS) && ($ONLY_JOBS =~ /.*\\baarch64-linux-alpine3_18-validate(\\s|$).*/)) || (($ONLY_JOBS == null) && (\"disabled\" != \"disabled\"))) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY == null)", + "if": "((($ONLY_JOBS) && ($ONLY_JOBS =~ /.*\\baarch64-linux-alpine3_22-validate(\\s|$).*/)) || (($ONLY_JOBS == null) && (\"disabled\" != \"disabled\"))) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY == null)", "when": "on_success" } ], @@ -120,13 +120,13 @@ ], "variables": { "BIGNUM_BACKEND": "gmp", - "BIN_DIST_NAME": "ghc-aarch64-linux-alpine3_18-validate", + "BIN_DIST_NAME": "ghc-aarch64-linux-alpine3_22-validate", "BROKEN_TESTS": "encoding004 T10458", "BUILD_FLAVOUR": "validate", "CONFIGURE_ARGS": "--disable-ld-override --enable-ignore-build-platform-mismatch --build=aarch64-unknown-linux --host=aarch64-unknown-linux --target=aarch64-unknown-linux --enable-strict-ghc-toolchain-check", "INSTALL_CONFIGURE_ARGS": "--disable-ld-override --enable-strict-ghc-toolchain-check", "RUNTEST_ARGS": "", - "TEST_ENV": "aarch64-linux-alpine3_18-validate" + "TEST_ENV": "aarch64-linux-alpine3_22-validate" } }, "aarch64-linux-deb10-validate": { @@ -477,7 +477,7 @@ "WindresCmd": "/opt/llvm-mingw-linux/bin/aarch64-w64-mingw32-windres" } }, - "i386-linux-alpine3_20-validate": { + "i386-linux-alpine3_22-validate": { "after_script": [ ".gitlab/ci.sh save_cache", ".gitlab/ci.sh save_test_output", @@ -488,7 +488,7 @@ "artifacts": { "expire_in": "2 weeks", "paths": [ - "ghc-i386-linux-alpine3_20-validate.tar.xz", + "ghc-i386-linux-alpine3_22-validate.tar.xz", "junit.xml", "unexpected-test-output.tar.gz" ], @@ -498,14 +498,14 @@ "when": "always" }, "cache": { - "key": "i386-linux-alpine3_20-$CACHE_REV", + "key": "i386-linux-alpine3_22-$CACHE_REV", "paths": [ "cabal-cache", "toolchain" ] }, "dependencies": [], - "image": "registry.gitlab.haskell.org/ghc/ci-images/i386-linux-alpine3_20:$DOCKER_REV", + "image": "registry.gitlab.haskell.org/ghc/ci-images/i386-linux-alpine3_22:$DOCKER_REV", "needs": [ { "artifacts": false, @@ -514,7 +514,7 @@ ], "rules": [ { - "if": "((($ONLY_JOBS) && ($ONLY_JOBS =~ /.*\\bi386-linux-alpine3_20-validate(\\s|$).*/)) || (($ONLY_JOBS == null) && ((($CI_MERGE_REQUEST_LABELS =~ /.*full-ci.*/) || ($CI_MERGE_REQUEST_LABELS =~ /.*marge_bot_batch_merge_job.*/) || ($CI_COMMIT_BRANCH == \"master\") || ($CI_COMMIT_BRANCH =~ /ghc-[0-9]+\\.[0-9]+/))))) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY == null)", + "if": "((($ONLY_JOBS) && ($ONLY_JOBS =~ /.*\\bi386-linux-alpine3_22-validate(\\s|$).*/)) || (($ONLY_JOBS == null) && ((($CI_MERGE_REQUEST_LABELS =~ /.*full-ci.*/) || ($CI_MERGE_REQUEST_LABELS =~ /.*marge_bot_batch_merge_job.*/) || ($CI_COMMIT_BRANCH == \"master\") || ($CI_COMMIT_BRANCH =~ /ghc-[0-9]+\\.[0-9]+/))))) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY == null)", "when": "on_success" } ], @@ -531,13 +531,13 @@ ], "variables": { "BIGNUM_BACKEND": "gmp", - "BIN_DIST_NAME": "ghc-i386-linux-alpine3_20-validate", + "BIN_DIST_NAME": "ghc-i386-linux-alpine3_22-validate", "BROKEN_TESTS": "encoding004 T10458 simd009 T25169 T22033", "BUILD_FLAVOUR": "validate", "CONFIGURE_ARGS": "--disable-ld-override --enable-strict-ghc-toolchain-check", "INSTALL_CONFIGURE_ARGS": "--disable-ld-override --enable-strict-ghc-toolchain-check", "RUNTEST_ARGS": "", - "TEST_ENV": "i386-linux-alpine3_20-validate" + "TEST_ENV": "i386-linux-alpine3_22-validate" } }, "i386-linux-deb10-validate": { @@ -731,7 +731,7 @@ "XZ_OPT": "-9" } }, - "nightly-aarch64-linux-alpine3_18-validate": { + "nightly-aarch64-linux-alpine3_22-validate": { "after_script": [ ".gitlab/ci.sh save_cache", ".gitlab/ci.sh save_test_output", @@ -742,7 +742,7 @@ "artifacts": { "expire_in": "8 weeks", "paths": [ - "ghc-aarch64-linux-alpine3_18-validate.tar.xz", + "ghc-aarch64-linux-alpine3_22-validate.tar.xz", "junit.xml", "unexpected-test-output.tar.gz" ], @@ -752,14 +752,14 @@ "when": "always" }, "cache": { - "key": "aarch64-linux-alpine3_18-$CACHE_REV", + "key": "aarch64-linux-alpine3_22-$CACHE_REV", "paths": [ "cabal-cache", "toolchain" ] }, "dependencies": [], - "image": "registry.gitlab.haskell.org/ghc/ci-images/aarch64-linux-alpine3_18:$DOCKER_REV", + "image": "registry.gitlab.haskell.org/ghc/ci-images/aarch64-linux-alpine3_22:$DOCKER_REV", "needs": [ { "artifacts": false, @@ -785,13 +785,13 @@ ], "variables": { "BIGNUM_BACKEND": "gmp", - "BIN_DIST_NAME": "ghc-aarch64-linux-alpine3_18-validate", + "BIN_DIST_NAME": "ghc-aarch64-linux-alpine3_22-validate", "BROKEN_TESTS": "encoding004 T10458", "BUILD_FLAVOUR": "validate", "CONFIGURE_ARGS": "--disable-ld-override --enable-ignore-build-platform-mismatch --build=aarch64-unknown-linux --host=aarch64-unknown-linux --target=aarch64-unknown-linux --enable-strict-ghc-toolchain-check", "INSTALL_CONFIGURE_ARGS": "--disable-ld-override --enable-strict-ghc-toolchain-check", "RUNTEST_ARGS": "", - "TEST_ENV": "aarch64-linux-alpine3_18-validate", + "TEST_ENV": "aarch64-linux-alpine3_22-validate", "XZ_OPT": "-9" } }, @@ -1148,7 +1148,7 @@ "XZ_OPT": "-9" } }, - "nightly-i386-linux-alpine3_20-validate": { + "nightly-i386-linux-alpine3_22-validate": { "after_script": [ ".gitlab/ci.sh save_cache", ".gitlab/ci.sh save_test_output", @@ -1159,7 +1159,7 @@ "artifacts": { "expire_in": "8 weeks", "paths": [ - "ghc-i386-linux-alpine3_20-validate.tar.xz", + "ghc-i386-linux-alpine3_22-validate.tar.xz", "junit.xml", "unexpected-test-output.tar.gz" ], @@ -1169,14 +1169,14 @@ "when": "always" }, "cache": { - "key": "i386-linux-alpine3_20-$CACHE_REV", + "key": "i386-linux-alpine3_22-$CACHE_REV", "paths": [ "cabal-cache", "toolchain" ] }, "dependencies": [], - "image": "registry.gitlab.haskell.org/ghc/ci-images/i386-linux-alpine3_20:$DOCKER_REV", + "image": "registry.gitlab.haskell.org/ghc/ci-images/i386-linux-alpine3_22:$DOCKER_REV", "needs": [ { "artifacts": false, @@ -1202,13 +1202,13 @@ ], "variables": { "BIGNUM_BACKEND": "gmp", - "BIN_DIST_NAME": "ghc-i386-linux-alpine3_20-validate", + "BIN_DIST_NAME": "ghc-i386-linux-alpine3_22-validate", "BROKEN_TESTS": "encoding004 T10458 simd009 T25169 T22033", "BUILD_FLAVOUR": "validate", "CONFIGURE_ARGS": "--disable-ld-override --enable-strict-ghc-toolchain-check", "INSTALL_CONFIGURE_ARGS": "--disable-ld-override --enable-strict-ghc-toolchain-check", "RUNTEST_ARGS": "", - "TEST_ENV": "i386-linux-alpine3_20-validate", + "TEST_ENV": "i386-linux-alpine3_22-validate", "XZ_OPT": "-9" } }, @@ -1538,70 +1538,6 @@ "XZ_OPT": "-9" } }, - "nightly-x86_64-linux-alpine3_12-validate": { - "after_script": [ - ".gitlab/ci.sh save_cache", - ".gitlab/ci.sh save_test_output", - ".gitlab/ci.sh clean", - "cat ci_timings.txt" - ], - "allow_failure": false, - "artifacts": { - "expire_in": "8 weeks", - "paths": [ - "ghc-x86_64-linux-alpine3_12-validate.tar.xz", - "junit.xml", - "unexpected-test-output.tar.gz" - ], - "reports": { - "junit": "junit.xml" - }, - "when": "always" - }, - "cache": { - "key": "x86_64-linux-alpine3_12-$CACHE_REV", - "paths": [ - "cabal-cache", - "toolchain" - ] - }, - "dependencies": [], - "image": "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-alpine3_12:$DOCKER_REV", - "needs": [ - { - "artifacts": false, - "job": "hadrian-ghc-in-ghci" - } - ], - "rules": [ - { - "if": "(\"true\" == \"true\") && ($RELEASE_JOB != \"yes\") && ($NIGHTLY)", - "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": [ - "x86_64-linux" - ], - "variables": { - "BIGNUM_BACKEND": "gmp", - "BIN_DIST_NAME": "ghc-x86_64-linux-alpine3_12-validate", - "BROKEN_TESTS": "encoding004 T10458", - "BUILD_FLAVOUR": "validate", - "CONFIGURE_ARGS": "--disable-ld-override --enable-strict-ghc-toolchain-check", - "INSTALL_CONFIGURE_ARGS": "--disable-ld-override --enable-strict-ghc-toolchain-check", - "RUNTEST_ARGS": "", - "TEST_ENV": "x86_64-linux-alpine3_12-validate", - "XZ_OPT": "-9" - } - }, "nightly-x86_64-linux-alpine3_12-validate+fully_static": { "after_script": [ ".gitlab/ci.sh save_cache", @@ -1666,7 +1602,7 @@ "XZ_OPT": "-9" } }, - "nightly-x86_64-linux-alpine3_20-validate": { + "nightly-x86_64-linux-alpine3_22-validate": { "after_script": [ ".gitlab/ci.sh save_cache", ".gitlab/ci.sh save_test_output", @@ -1677,7 +1613,7 @@ "artifacts": { "expire_in": "8 weeks", "paths": [ - "ghc-x86_64-linux-alpine3_20-validate.tar.xz", + "ghc-x86_64-linux-alpine3_22-validate.tar.xz", "junit.xml", "unexpected-test-output.tar.gz" ], @@ -1687,14 +1623,14 @@ "when": "always" }, "cache": { - "key": "x86_64-linux-alpine3_20-$CACHE_REV", + "key": "x86_64-linux-alpine3_22-$CACHE_REV", "paths": [ "cabal-cache", "toolchain" ] }, "dependencies": [], - "image": "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-alpine3_20:$DOCKER_REV", + "image": "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-alpine3_22:$DOCKER_REV", "needs": [ { "artifacts": false, @@ -1720,17 +1656,17 @@ ], "variables": { "BIGNUM_BACKEND": "gmp", - "BIN_DIST_NAME": "ghc-x86_64-linux-alpine3_20-validate", + "BIN_DIST_NAME": "ghc-x86_64-linux-alpine3_22-validate", "BROKEN_TESTS": "encoding004 T10458", "BUILD_FLAVOUR": "validate", "CONFIGURE_ARGS": "--disable-ld-override --enable-strict-ghc-toolchain-check", "INSTALL_CONFIGURE_ARGS": "--disable-ld-override --enable-strict-ghc-toolchain-check", "RUNTEST_ARGS": "", - "TEST_ENV": "x86_64-linux-alpine3_20-validate", + "TEST_ENV": "x86_64-linux-alpine3_22-validate", "XZ_OPT": "-9" } }, - "nightly-x86_64-linux-alpine3_20-wasm-cross_wasm32-wasi-release+host_fully_static+text_simdutf": { + "nightly-x86_64-linux-alpine3_22-wasm-cross_wasm32-wasi-release+host_fully_static+text_simdutf": { "after_script": [ ".gitlab/ci.sh save_cache", ".gitlab/ci.sh save_test_output", @@ -1741,7 +1677,7 @@ "artifacts": { "expire_in": "8 weeks", "paths": [ - "ghc-x86_64-linux-alpine3_20-wasm-cross_wasm32-wasi-release+host_fully_static+text_simdutf.tar.xz", + "ghc-x86_64-linux-alpine3_22-wasm-cross_wasm32-wasi-release+host_fully_static+text_simdutf.tar.xz", "junit.xml", "unexpected-test-output.tar.gz" ], @@ -1751,14 +1687,14 @@ "when": "always" }, "cache": { - "key": "x86_64-linux-alpine3_20-wasm-$CACHE_REV", + "key": "x86_64-linux-alpine3_22-wasm-$CACHE_REV", "paths": [ "cabal-cache", "toolchain" ] }, "dependencies": [], - "image": "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-alpine3_20-wasm:$DOCKER_REV", + "image": "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-alpine3_22-wasm:$DOCKER_REV", "needs": [ { "artifacts": false, @@ -1784,18 +1720,18 @@ ], "variables": { "BIGNUM_BACKEND": "gmp", - "BIN_DIST_NAME": "ghc-x86_64-linux-alpine3_20-wasm-cross_wasm32-wasi-release+host_fully_static+text_simdutf", + "BIN_DIST_NAME": "ghc-x86_64-linux-alpine3_22-wasm-cross_wasm32-wasi-release+host_fully_static+text_simdutf", "BUILD_FLAVOUR": "release+host_fully_static+text_simdutf", "CONFIGURE_ARGS": "--with-intree-gmp --with-system-libffi --enable-strict-ghc-toolchain-check", "CROSS_TARGET": "wasm32-wasi", "FIREFOX_LAUNCH_OPTS": "{\"browser\":\"firefox\",\"executablePath\":\"/usr/bin/firefox\"}", "HADRIAN_ARGS": "--docs=no-sphinx-pdfs --docs=no-sphinx-man", "RUNTEST_ARGS": "", - "TEST_ENV": "x86_64-linux-alpine3_20-wasm-cross_wasm32-wasi-release+host_fully_static+text_simdutf", + "TEST_ENV": "x86_64-linux-alpine3_22-wasm-cross_wasm32-wasi-release+host_fully_static+text_simdutf", "XZ_OPT": "-9" } }, - "nightly-x86_64-linux-alpine3_20-wasm-int_native-cross_wasm32-wasi-release+host_fully_static+text_simdutf": { + "nightly-x86_64-linux-alpine3_22-wasm-int_native-cross_wasm32-wasi-release+host_fully_static+text_simdutf": { "after_script": [ ".gitlab/ci.sh save_cache", ".gitlab/ci.sh save_test_output", @@ -1806,7 +1742,7 @@ "artifacts": { "expire_in": "8 weeks", "paths": [ - "ghc-x86_64-linux-alpine3_20-wasm-int_native-cross_wasm32-wasi-release+host_fully_static+text_simdutf.tar.xz", + "ghc-x86_64-linux-alpine3_22-wasm-int_native-cross_wasm32-wasi-release+host_fully_static+text_simdutf.tar.xz", "junit.xml", "unexpected-test-output.tar.gz" ], @@ -1816,14 +1752,14 @@ "when": "always" }, "cache": { - "key": "x86_64-linux-alpine3_20-wasm-$CACHE_REV", + "key": "x86_64-linux-alpine3_22-wasm-$CACHE_REV", "paths": [ "cabal-cache", "toolchain" ] }, "dependencies": [], - "image": "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-alpine3_20-wasm:$DOCKER_REV", + "image": "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-alpine3_22-wasm:$DOCKER_REV", "needs": [ { "artifacts": false, @@ -1849,18 +1785,18 @@ ], "variables": { "BIGNUM_BACKEND": "native", - "BIN_DIST_NAME": "ghc-x86_64-linux-alpine3_20-wasm-int_native-cross_wasm32-wasi-release+host_fully_static+text_simdutf", + "BIN_DIST_NAME": "ghc-x86_64-linux-alpine3_22-wasm-int_native-cross_wasm32-wasi-release+host_fully_static+text_simdutf", "BUILD_FLAVOUR": "release+host_fully_static+text_simdutf", "CONFIGURE_ARGS": "--with-intree-gmp --with-system-libffi --enable-strict-ghc-toolchain-check", "CROSS_TARGET": "wasm32-wasi", "FIREFOX_LAUNCH_OPTS": "{\"browser\":\"firefox\",\"executablePath\":\"/usr/bin/firefox\"}", "HADRIAN_ARGS": "--docs=no-sphinx-pdfs --docs=no-sphinx-man", "RUNTEST_ARGS": "", - "TEST_ENV": "x86_64-linux-alpine3_20-wasm-int_native-cross_wasm32-wasi-release+host_fully_static+text_simdutf", + "TEST_ENV": "x86_64-linux-alpine3_22-wasm-int_native-cross_wasm32-wasi-release+host_fully_static+text_simdutf", "XZ_OPT": "-9" } }, - "nightly-x86_64-linux-alpine3_20-wasm-unreg-cross_wasm32-wasi-release+host_fully_static+text_simdutf": { + "nightly-x86_64-linux-alpine3_22-wasm-unreg-cross_wasm32-wasi-release+host_fully_static+text_simdutf": { "after_script": [ ".gitlab/ci.sh save_cache", ".gitlab/ci.sh save_test_output", @@ -1871,7 +1807,7 @@ "artifacts": { "expire_in": "8 weeks", "paths": [ - "ghc-x86_64-linux-alpine3_20-wasm-unreg-cross_wasm32-wasi-release+host_fully_static+text_simdutf.tar.xz", + "ghc-x86_64-linux-alpine3_22-wasm-unreg-cross_wasm32-wasi-release+host_fully_static+text_simdutf.tar.xz", "junit.xml", "unexpected-test-output.tar.gz" ], @@ -1881,14 +1817,14 @@ "when": "always" }, "cache": { - "key": "x86_64-linux-alpine3_20-wasm-$CACHE_REV", + "key": "x86_64-linux-alpine3_22-wasm-$CACHE_REV", "paths": [ "cabal-cache", "toolchain" ] }, "dependencies": [], - "image": "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-alpine3_20-wasm:$DOCKER_REV", + "image": "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-alpine3_22-wasm:$DOCKER_REV", "needs": [ { "artifacts": false, @@ -1914,14 +1850,14 @@ ], "variables": { "BIGNUM_BACKEND": "gmp", - "BIN_DIST_NAME": "ghc-x86_64-linux-alpine3_20-wasm-unreg-cross_wasm32-wasi-release+host_fully_static+text_simdutf", + "BIN_DIST_NAME": "ghc-x86_64-linux-alpine3_22-wasm-unreg-cross_wasm32-wasi-release+host_fully_static+text_simdutf", "BUILD_FLAVOUR": "release+host_fully_static+text_simdutf", "CONFIGURE_ARGS": "--enable-unregisterised --with-intree-gmp --with-system-libffi --enable-strict-ghc-toolchain-check", "CROSS_TARGET": "wasm32-wasi", "FIREFOX_LAUNCH_OPTS": "{\"browser\":\"firefox\",\"executablePath\":\"/usr/bin/firefox\"}", "HADRIAN_ARGS": "--docs=no-sphinx-pdfs --docs=no-sphinx-man", "RUNTEST_ARGS": "", - "TEST_ENV": "x86_64-linux-alpine3_20-wasm-unreg-cross_wasm32-wasi-release+host_fully_static+text_simdutf", + "TEST_ENV": "x86_64-linux-alpine3_22-wasm-unreg-cross_wasm32-wasi-release+host_fully_static+text_simdutf", "XZ_OPT": "-9" } }, @@ -3839,7 +3775,7 @@ "XZ_OPT": "-9" } }, - "release-aarch64-linux-alpine3_18-release+no_split_sections": { + "release-aarch64-linux-alpine3_22-release+no_split_sections": { "after_script": [ ".gitlab/ci.sh save_cache", ".gitlab/ci.sh save_test_output", @@ -3850,7 +3786,7 @@ "artifacts": { "expire_in": "1 year", "paths": [ - "ghc-aarch64-linux-alpine3_18-release+no_split_sections.tar.xz", + "ghc-aarch64-linux-alpine3_22-release+no_split_sections.tar.xz", "junit.xml", "unexpected-test-output.tar.gz" ], @@ -3860,14 +3796,14 @@ "when": "always" }, "cache": { - "key": "aarch64-linux-alpine3_18-$CACHE_REV", + "key": "aarch64-linux-alpine3_22-$CACHE_REV", "paths": [ "cabal-cache", "toolchain" ] }, "dependencies": [], - "image": "registry.gitlab.haskell.org/ghc/ci-images/aarch64-linux-alpine3_18:$DOCKER_REV", + "image": "registry.gitlab.haskell.org/ghc/ci-images/aarch64-linux-alpine3_22:$DOCKER_REV", "needs": [ { "artifacts": false, @@ -3893,14 +3829,14 @@ ], "variables": { "BIGNUM_BACKEND": "gmp", - "BIN_DIST_NAME": "ghc-aarch64-linux-alpine3_18-release+no_split_sections", + "BIN_DIST_NAME": "ghc-aarch64-linux-alpine3_22-release+no_split_sections", "BROKEN_TESTS": "encoding004 T10458", "BUILD_FLAVOUR": "release+no_split_sections", "CONFIGURE_ARGS": "--disable-ld-override --enable-ignore-build-platform-mismatch --build=aarch64-unknown-linux --host=aarch64-unknown-linux --target=aarch64-unknown-linux --enable-strict-ghc-toolchain-check", "IGNORE_PERF_FAILURES": "all", "INSTALL_CONFIGURE_ARGS": "--disable-ld-override --enable-strict-ghc-toolchain-check", "RUNTEST_ARGS": "", - "TEST_ENV": "aarch64-linux-alpine3_18-release+no_split_sections", + "TEST_ENV": "aarch64-linux-alpine3_22-release+no_split_sections", "XZ_OPT": "-9" } }, @@ -4032,7 +3968,7 @@ "XZ_OPT": "-9" } }, - "release-i386-linux-alpine3_20-release+no_split_sections": { + "release-i386-linux-alpine3_22-release+no_split_sections": { "after_script": [ ".gitlab/ci.sh save_cache", ".gitlab/ci.sh save_test_output", @@ -4043,7 +3979,7 @@ "artifacts": { "expire_in": "1 year", "paths": [ - "ghc-i386-linux-alpine3_20-release+no_split_sections.tar.xz", + "ghc-i386-linux-alpine3_22-release+no_split_sections.tar.xz", "junit.xml", "unexpected-test-output.tar.gz" ], @@ -4053,14 +3989,14 @@ "when": "always" }, "cache": { - "key": "i386-linux-alpine3_20-$CACHE_REV", + "key": "i386-linux-alpine3_22-$CACHE_REV", "paths": [ "cabal-cache", "toolchain" ] }, "dependencies": [], - "image": "registry.gitlab.haskell.org/ghc/ci-images/i386-linux-alpine3_20:$DOCKER_REV", + "image": "registry.gitlab.haskell.org/ghc/ci-images/i386-linux-alpine3_22:$DOCKER_REV", "needs": [ { "artifacts": false, @@ -4086,14 +4022,14 @@ ], "variables": { "BIGNUM_BACKEND": "gmp", - "BIN_DIST_NAME": "ghc-i386-linux-alpine3_20-release+no_split_sections", + "BIN_DIST_NAME": "ghc-i386-linux-alpine3_22-release+no_split_sections", "BROKEN_TESTS": "encoding004 T10458 simd009 T25169 T22033", "BUILD_FLAVOUR": "release+no_split_sections", "CONFIGURE_ARGS": "--disable-ld-override --enable-strict-ghc-toolchain-check", "IGNORE_PERF_FAILURES": "all", "INSTALL_CONFIGURE_ARGS": "--disable-ld-override --enable-strict-ghc-toolchain-check", "RUNTEST_ARGS": "", - "TEST_ENV": "i386-linux-alpine3_20-release+no_split_sections", + "TEST_ENV": "i386-linux-alpine3_22-release+no_split_sections", "XZ_OPT": "-9" } }, @@ -4493,7 +4429,7 @@ "XZ_OPT": "-9" } }, - "release-x86_64-linux-alpine3_12-release+no_split_sections": { + "release-x86_64-linux-alpine3_22-release+no_split_sections": { "after_script": [ ".gitlab/ci.sh save_cache", ".gitlab/ci.sh save_test_output", @@ -4504,7 +4440,7 @@ "artifacts": { "expire_in": "1 year", "paths": [ - "ghc-x86_64-linux-alpine3_12-release+no_split_sections.tar.xz", + "ghc-x86_64-linux-alpine3_22-release+no_split_sections.tar.xz", "junit.xml", "unexpected-test-output.tar.gz" ], @@ -4514,14 +4450,14 @@ "when": "always" }, "cache": { - "key": "x86_64-linux-alpine3_12-$CACHE_REV", + "key": "x86_64-linux-alpine3_22-$CACHE_REV", "paths": [ "cabal-cache", "toolchain" ] }, "dependencies": [], - "image": "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-alpine3_12:$DOCKER_REV", + "image": "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-alpine3_22:$DOCKER_REV", "needs": [ { "artifacts": false, @@ -4547,79 +4483,14 @@ ], "variables": { "BIGNUM_BACKEND": "gmp", - "BIN_DIST_NAME": "ghc-x86_64-linux-alpine3_12-release+no_split_sections", + "BIN_DIST_NAME": "ghc-x86_64-linux-alpine3_22-release+no_split_sections", "BROKEN_TESTS": "encoding004 T10458", "BUILD_FLAVOUR": "release+no_split_sections", "CONFIGURE_ARGS": "--disable-ld-override --enable-strict-ghc-toolchain-check", "IGNORE_PERF_FAILURES": "all", "INSTALL_CONFIGURE_ARGS": "--disable-ld-override --enable-strict-ghc-toolchain-check", "RUNTEST_ARGS": "", - "TEST_ENV": "x86_64-linux-alpine3_12-release+no_split_sections", - "XZ_OPT": "-9" - } - }, - "release-x86_64-linux-alpine3_20-release+no_split_sections": { - "after_script": [ - ".gitlab/ci.sh save_cache", - ".gitlab/ci.sh save_test_output", - ".gitlab/ci.sh clean", - "cat ci_timings.txt" - ], - "allow_failure": false, - "artifacts": { - "expire_in": "1 year", - "paths": [ - "ghc-x86_64-linux-alpine3_20-release+no_split_sections.tar.xz", - "junit.xml", - "unexpected-test-output.tar.gz" - ], - "reports": { - "junit": "junit.xml" - }, - "when": "always" - }, - "cache": { - "key": "x86_64-linux-alpine3_20-$CACHE_REV", - "paths": [ - "cabal-cache", - "toolchain" - ] - }, - "dependencies": [], - "image": "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-alpine3_20:$DOCKER_REV", - "needs": [ - { - "artifacts": false, - "job": "hadrian-ghc-in-ghci" - } - ], - "rules": [ - { - "if": "(\"true\" == \"true\") && ($RELEASE_JOB == \"yes\") && ($NIGHTLY == null)", - "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": [ - "x86_64-linux" - ], - "variables": { - "BIGNUM_BACKEND": "gmp", - "BIN_DIST_NAME": "ghc-x86_64-linux-alpine3_20-release+no_split_sections", - "BROKEN_TESTS": "encoding004 T10458", - "BUILD_FLAVOUR": "release+no_split_sections", - "CONFIGURE_ARGS": "--disable-ld-override --enable-strict-ghc-toolchain-check", - "IGNORE_PERF_FAILURES": "all", - "INSTALL_CONFIGURE_ARGS": "--disable-ld-override --enable-strict-ghc-toolchain-check", - "RUNTEST_ARGS": "", - "TEST_ENV": "x86_64-linux-alpine3_20-release+no_split_sections", + "TEST_ENV": "x86_64-linux-alpine3_22-release+no_split_sections", "XZ_OPT": "-9" } }, @@ -5851,69 +5722,6 @@ "TEST_ENV": "x86_64-linux-alpine3_12-int_native-validate+fully_static" } }, - "x86_64-linux-alpine3_12-validate": { - "after_script": [ - ".gitlab/ci.sh save_cache", - ".gitlab/ci.sh save_test_output", - ".gitlab/ci.sh clean", - "cat ci_timings.txt" - ], - "allow_failure": false, - "artifacts": { - "expire_in": "2 weeks", - "paths": [ - "ghc-x86_64-linux-alpine3_12-validate.tar.xz", - "junit.xml", - "unexpected-test-output.tar.gz" - ], - "reports": { - "junit": "junit.xml" - }, - "when": "always" - }, - "cache": { - "key": "x86_64-linux-alpine3_12-$CACHE_REV", - "paths": [ - "cabal-cache", - "toolchain" - ] - }, - "dependencies": [], - "image": "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-alpine3_12:$DOCKER_REV", - "needs": [ - { - "artifacts": false, - "job": "hadrian-ghc-in-ghci" - } - ], - "rules": [ - { - "if": "((($ONLY_JOBS) && ($ONLY_JOBS =~ /.*\\bx86_64-linux-alpine3_12-validate(\\s|$).*/)) || (($ONLY_JOBS == null) && (\"disabled\" != \"disabled\"))) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY == null)", - "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": [ - "x86_64-linux" - ], - "variables": { - "BIGNUM_BACKEND": "gmp", - "BIN_DIST_NAME": "ghc-x86_64-linux-alpine3_12-validate", - "BROKEN_TESTS": "encoding004 T10458", - "BUILD_FLAVOUR": "validate", - "CONFIGURE_ARGS": "--disable-ld-override --enable-strict-ghc-toolchain-check", - "INSTALL_CONFIGURE_ARGS": "--disable-ld-override --enable-strict-ghc-toolchain-check", - "RUNTEST_ARGS": "", - "TEST_ENV": "x86_64-linux-alpine3_12-validate" - } - }, "x86_64-linux-alpine3_12-validate+fully_static": { "after_script": [ ".gitlab/ci.sh save_cache", @@ -5977,7 +5785,7 @@ "TEST_ENV": "x86_64-linux-alpine3_12-validate+fully_static" } }, - "x86_64-linux-alpine3_20-validate": { + "x86_64-linux-alpine3_22-validate": { "after_script": [ ".gitlab/ci.sh save_cache", ".gitlab/ci.sh save_test_output", @@ -5988,7 +5796,7 @@ "artifacts": { "expire_in": "2 weeks", "paths": [ - "ghc-x86_64-linux-alpine3_20-validate.tar.xz", + "ghc-x86_64-linux-alpine3_22-validate.tar.xz", "junit.xml", "unexpected-test-output.tar.gz" ], @@ -5998,14 +5806,14 @@ "when": "always" }, "cache": { - "key": "x86_64-linux-alpine3_20-$CACHE_REV", + "key": "x86_64-linux-alpine3_22-$CACHE_REV", "paths": [ "cabal-cache", "toolchain" ] }, "dependencies": [], - "image": "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-alpine3_20:$DOCKER_REV", + "image": "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-alpine3_22:$DOCKER_REV", "needs": [ { "artifacts": false, @@ -6014,7 +5822,7 @@ ], "rules": [ { - "if": "((($ONLY_JOBS) && ($ONLY_JOBS =~ /.*\\bx86_64-linux-alpine3_20-validate(\\s|$).*/)) || (($ONLY_JOBS == null) && (\"disabled\" != \"disabled\"))) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY == null)", + "if": "((($ONLY_JOBS) && ($ONLY_JOBS =~ /.*\\bx86_64-linux-alpine3_22-validate(\\s|$).*/)) || (($ONLY_JOBS == null) && (\"disabled\" != \"disabled\"))) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY == null)", "when": "on_success" } ], @@ -6031,16 +5839,16 @@ ], "variables": { "BIGNUM_BACKEND": "gmp", - "BIN_DIST_NAME": "ghc-x86_64-linux-alpine3_20-validate", + "BIN_DIST_NAME": "ghc-x86_64-linux-alpine3_22-validate", "BROKEN_TESTS": "encoding004 T10458", "BUILD_FLAVOUR": "validate", "CONFIGURE_ARGS": "--disable-ld-override --enable-strict-ghc-toolchain-check", "INSTALL_CONFIGURE_ARGS": "--disable-ld-override --enable-strict-ghc-toolchain-check", "RUNTEST_ARGS": "", - "TEST_ENV": "x86_64-linux-alpine3_20-validate" + "TEST_ENV": "x86_64-linux-alpine3_22-validate" } }, - "x86_64-linux-alpine3_20-wasm-cross_wasm32-wasi-release+host_fully_static+text_simdutf": { + "x86_64-linux-alpine3_22-wasm-cross_wasm32-wasi-release+host_fully_static+text_simdutf": { "after_script": [ ".gitlab/ci.sh save_cache", ".gitlab/ci.sh save_test_output", @@ -6051,7 +5859,7 @@ "artifacts": { "expire_in": "2 weeks", "paths": [ - "ghc-x86_64-linux-alpine3_20-wasm-cross_wasm32-wasi-release+host_fully_static+text_simdutf.tar.xz", + "ghc-x86_64-linux-alpine3_22-wasm-cross_wasm32-wasi-release+host_fully_static+text_simdutf.tar.xz", "junit.xml", "unexpected-test-output.tar.gz" ], @@ -6061,14 +5869,14 @@ "when": "always" }, "cache": { - "key": "x86_64-linux-alpine3_20-wasm-$CACHE_REV", + "key": "x86_64-linux-alpine3_22-wasm-$CACHE_REV", "paths": [ "cabal-cache", "toolchain" ] }, "dependencies": [], - "image": "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-alpine3_20-wasm:$DOCKER_REV", + "image": "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-alpine3_22-wasm:$DOCKER_REV", "needs": [ { "artifacts": false, @@ -6077,7 +5885,7 @@ ], "rules": [ { - "if": "((($ONLY_JOBS) && ($ONLY_JOBS =~ /.*\\bx86_64-linux-alpine3_20-wasm-cross_wasm32-wasi-release\\+host_fully_static\\+text_simdutf(\\s|$).*/)) || (($ONLY_JOBS == null) && ((($CI_MERGE_REQUEST_LABELS =~ /.*full-ci.*/) || ($CI_MERGE_REQUEST_LABELS =~ /.*marge_bot_batch_merge_job.*/) || ($CI_COMMIT_BRANCH == \"master\") || ($CI_COMMIT_BRANCH =~ /ghc-[0-9]+\\.[0-9]+/)) || ($CI_MERGE_REQUEST_LABELS =~ /.*wasm.*/)))) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY == null)", + "if": "((($ONLY_JOBS) && ($ONLY_JOBS =~ /.*\\bx86_64-linux-alpine3_22-wasm-cross_wasm32-wasi-release\\+host_fully_static\\+text_simdutf(\\s|$).*/)) || (($ONLY_JOBS == null) && ((($CI_MERGE_REQUEST_LABELS =~ /.*full-ci.*/) || ($CI_MERGE_REQUEST_LABELS =~ /.*marge_bot_batch_merge_job.*/) || ($CI_COMMIT_BRANCH == \"master\") || ($CI_COMMIT_BRANCH =~ /ghc-[0-9]+\\.[0-9]+/)) || ($CI_MERGE_REQUEST_LABELS =~ /.*wasm.*/)))) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY == null)", "when": "on_success" } ], @@ -6094,17 +5902,17 @@ ], "variables": { "BIGNUM_BACKEND": "gmp", - "BIN_DIST_NAME": "ghc-x86_64-linux-alpine3_20-wasm-cross_wasm32-wasi-release+host_fully_static+text_simdutf", + "BIN_DIST_NAME": "ghc-x86_64-linux-alpine3_22-wasm-cross_wasm32-wasi-release+host_fully_static+text_simdutf", "BUILD_FLAVOUR": "release+host_fully_static+text_simdutf", "CONFIGURE_ARGS": "--with-intree-gmp --with-system-libffi --enable-strict-ghc-toolchain-check", "CROSS_TARGET": "wasm32-wasi", "FIREFOX_LAUNCH_OPTS": "{\"browser\":\"firefox\",\"executablePath\":\"/usr/bin/firefox\"}", "HADRIAN_ARGS": "--docs=no-sphinx-pdfs --docs=no-sphinx-man", "RUNTEST_ARGS": "", - "TEST_ENV": "x86_64-linux-alpine3_20-wasm-cross_wasm32-wasi-release+host_fully_static+text_simdutf" + "TEST_ENV": "x86_64-linux-alpine3_22-wasm-cross_wasm32-wasi-release+host_fully_static+text_simdutf" } }, - "x86_64-linux-alpine3_20-wasm-int_native-cross_wasm32-wasi-release+host_fully_static+text_simdutf": { + "x86_64-linux-alpine3_22-wasm-int_native-cross_wasm32-wasi-release+host_fully_static+text_simdutf": { "after_script": [ ".gitlab/ci.sh save_cache", ".gitlab/ci.sh save_test_output", @@ -6115,7 +5923,7 @@ "artifacts": { "expire_in": "2 weeks", "paths": [ - "ghc-x86_64-linux-alpine3_20-wasm-int_native-cross_wasm32-wasi-release+host_fully_static+text_simdutf.tar.xz", + "ghc-x86_64-linux-alpine3_22-wasm-int_native-cross_wasm32-wasi-release+host_fully_static+text_simdutf.tar.xz", "junit.xml", "unexpected-test-output.tar.gz" ], @@ -6125,14 +5933,14 @@ "when": "always" }, "cache": { - "key": "x86_64-linux-alpine3_20-wasm-$CACHE_REV", + "key": "x86_64-linux-alpine3_22-wasm-$CACHE_REV", "paths": [ "cabal-cache", "toolchain" ] }, "dependencies": [], - "image": "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-alpine3_20-wasm:$DOCKER_REV", + "image": "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-alpine3_22-wasm:$DOCKER_REV", "needs": [ { "artifacts": false, @@ -6142,7 +5950,7 @@ "rules": [ { "allow_failure": true, - "if": "((($ONLY_JOBS) && ($ONLY_JOBS =~ /.*\\bx86_64-linux-alpine3_20-wasm-int_native-cross_wasm32-wasi-release\\+host_fully_static\\+text_simdutf(\\s|$).*/)) || (($ONLY_JOBS == null) && ((($CI_MERGE_REQUEST_LABELS =~ /.*full-ci.*/) || ($CI_MERGE_REQUEST_LABELS =~ /.*marge_bot_batch_merge_job.*/) || ($CI_COMMIT_BRANCH == \"master\") || ($CI_COMMIT_BRANCH =~ /ghc-[0-9]+\\.[0-9]+/)) || ($CI_MERGE_REQUEST_LABELS =~ /.*wasm.*/)))) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY == null)", + "if": "((($ONLY_JOBS) && ($ONLY_JOBS =~ /.*\\bx86_64-linux-alpine3_22-wasm-int_native-cross_wasm32-wasi-release\\+host_fully_static\\+text_simdutf(\\s|$).*/)) || (($ONLY_JOBS == null) && ((($CI_MERGE_REQUEST_LABELS =~ /.*full-ci.*/) || ($CI_MERGE_REQUEST_LABELS =~ /.*marge_bot_batch_merge_job.*/) || ($CI_COMMIT_BRANCH == \"master\") || ($CI_COMMIT_BRANCH =~ /ghc-[0-9]+\\.[0-9]+/)) || ($CI_MERGE_REQUEST_LABELS =~ /.*wasm.*/)))) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY == null)", "when": "manual" } ], @@ -6159,17 +5967,17 @@ ], "variables": { "BIGNUM_BACKEND": "native", - "BIN_DIST_NAME": "ghc-x86_64-linux-alpine3_20-wasm-int_native-cross_wasm32-wasi-release+host_fully_static+text_simdutf", + "BIN_DIST_NAME": "ghc-x86_64-linux-alpine3_22-wasm-int_native-cross_wasm32-wasi-release+host_fully_static+text_simdutf", "BUILD_FLAVOUR": "release+host_fully_static+text_simdutf", "CONFIGURE_ARGS": "--with-intree-gmp --with-system-libffi --enable-strict-ghc-toolchain-check", "CROSS_TARGET": "wasm32-wasi", "FIREFOX_LAUNCH_OPTS": "{\"browser\":\"firefox\",\"executablePath\":\"/usr/bin/firefox\"}", "HADRIAN_ARGS": "--docs=no-sphinx-pdfs --docs=no-sphinx-man", "RUNTEST_ARGS": "", - "TEST_ENV": "x86_64-linux-alpine3_20-wasm-int_native-cross_wasm32-wasi-release+host_fully_static+text_simdutf" + "TEST_ENV": "x86_64-linux-alpine3_22-wasm-int_native-cross_wasm32-wasi-release+host_fully_static+text_simdutf" } }, - "x86_64-linux-alpine3_20-wasm-unreg-cross_wasm32-wasi-release+host_fully_static+text_simdutf": { + "x86_64-linux-alpine3_22-wasm-unreg-cross_wasm32-wasi-release+host_fully_static+text_simdutf": { "after_script": [ ".gitlab/ci.sh save_cache", ".gitlab/ci.sh save_test_output", @@ -6180,7 +5988,7 @@ "artifacts": { "expire_in": "2 weeks", "paths": [ - "ghc-x86_64-linux-alpine3_20-wasm-unreg-cross_wasm32-wasi-release+host_fully_static+text_simdutf.tar.xz", + "ghc-x86_64-linux-alpine3_22-wasm-unreg-cross_wasm32-wasi-release+host_fully_static+text_simdutf.tar.xz", "junit.xml", "unexpected-test-output.tar.gz" ], @@ -6190,14 +5998,14 @@ "when": "always" }, "cache": { - "key": "x86_64-linux-alpine3_20-wasm-$CACHE_REV", + "key": "x86_64-linux-alpine3_22-wasm-$CACHE_REV", "paths": [ "cabal-cache", "toolchain" ] }, "dependencies": [], - "image": "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-alpine3_20-wasm:$DOCKER_REV", + "image": "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-alpine3_22-wasm:$DOCKER_REV", "needs": [ { "artifacts": false, @@ -6207,7 +6015,7 @@ "rules": [ { "allow_failure": true, - "if": "((($ONLY_JOBS) && ($ONLY_JOBS =~ /.*\\bx86_64-linux-alpine3_20-wasm-unreg-cross_wasm32-wasi-release\\+host_fully_static\\+text_simdutf(\\s|$).*/)) || (($ONLY_JOBS == null) && ((($CI_MERGE_REQUEST_LABELS =~ /.*full-ci.*/) || ($CI_MERGE_REQUEST_LABELS =~ /.*marge_bot_batch_merge_job.*/) || ($CI_COMMIT_BRANCH == \"master\") || ($CI_COMMIT_BRANCH =~ /ghc-[0-9]+\\.[0-9]+/)) || ($CI_MERGE_REQUEST_LABELS =~ /.*wasm.*/)))) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY == null)", + "if": "((($ONLY_JOBS) && ($ONLY_JOBS =~ /.*\\bx86_64-linux-alpine3_22-wasm-unreg-cross_wasm32-wasi-release\\+host_fully_static\\+text_simdutf(\\s|$).*/)) || (($ONLY_JOBS == null) && ((($CI_MERGE_REQUEST_LABELS =~ /.*full-ci.*/) || ($CI_MERGE_REQUEST_LABELS =~ /.*marge_bot_batch_merge_job.*/) || ($CI_COMMIT_BRANCH == \"master\") || ($CI_COMMIT_BRANCH =~ /ghc-[0-9]+\\.[0-9]+/)) || ($CI_MERGE_REQUEST_LABELS =~ /.*wasm.*/)))) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY == null)", "when": "manual" } ], @@ -6224,14 +6032,14 @@ ], "variables": { "BIGNUM_BACKEND": "gmp", - "BIN_DIST_NAME": "ghc-x86_64-linux-alpine3_20-wasm-unreg-cross_wasm32-wasi-release+host_fully_static+text_simdutf", + "BIN_DIST_NAME": "ghc-x86_64-linux-alpine3_22-wasm-unreg-cross_wasm32-wasi-release+host_fully_static+text_simdutf", "BUILD_FLAVOUR": "release+host_fully_static+text_simdutf", "CONFIGURE_ARGS": "--enable-unregisterised --with-intree-gmp --with-system-libffi --enable-strict-ghc-toolchain-check", "CROSS_TARGET": "wasm32-wasi", "FIREFOX_LAUNCH_OPTS": "{\"browser\":\"firefox\",\"executablePath\":\"/usr/bin/firefox\"}", "HADRIAN_ARGS": "--docs=no-sphinx-pdfs --docs=no-sphinx-man", "RUNTEST_ARGS": "", - "TEST_ENV": "x86_64-linux-alpine3_20-wasm-unreg-cross_wasm32-wasi-release+host_fully_static+text_simdutf" + "TEST_ENV": "x86_64-linux-alpine3_22-wasm-unreg-cross_wasm32-wasi-release+host_fully_static+text_simdutf" } }, "x86_64-linux-deb10-validate": { ===================================== .gitlab/rel_eng/fetch-gitlab-artifacts/fetch_gitlab.py ===================================== @@ -32,19 +32,19 @@ def job_triple(job_name): 'release-x86_64-linux-deb10-release+debug_info': 'x86_64-deb10-linux-dwarf', 'release-x86_64-linux-deb10-release': 'x86_64-deb10-linux', 'release-x86_64-linux-deb9-release': 'x86_64-deb9-linux', - 'release-x86_64-linux-alpine3_12-release+fully_static': 'x86_64-alpine3_12-linux-static', - 'release-x86_64-linux-alpine3_12-release': 'x86_64-alpine3_12-linux', + 'release-x86_64-linux-alpine3_12-release+fully_static+no_split_sections': 'x86_64-alpine3_12-linux-static', + 'release-x86_64-linux-alpine3_22-release+no_split_sections': 'x86_64-alpine3_22-linux', 'release-x86_64-linux-alpine3_12-int_native-release+fully_static': 'x86_64-alpine3_12-linux-static-int_native', - 'release-x86_64-linux-alpine3_20-release': 'x86_64-alpine3_20-linux', 'release-x86_64-darwin-release': 'x86_64-apple-darwin', 'release-i386-linux-deb12-release': 'i386-deb12-linux', 'release-i386-linux-deb10-release': 'i386-deb10-linux', 'release-i386-linux-deb9-release': 'i386-deb9-linux', + 'release-i386-linux-alpine3_22-release+no_split_sections': 'i386-alpine3_22-linux', 'release-armv7-linux-deb10-release': 'armv7-deb10-linux', 'release-aarch64-linux-deb10-release': 'aarch64-deb10-linux', 'release-aarch64-linux-deb11-release': 'aarch64-deb11-linux', 'release-aarch64-linux-deb12-release': 'aarch64-deb12-linux', - 'release-aarch64-linux-alpine3_18-release+no_split_sections': 'aarch64-alpine3_18-linux', + 'release-aarch64-linux-alpine3_22-release+no_split_sections': 'aarch64-alpine3_22-linux', 'release-aarch64-darwin-release': 'aarch64-apple-darwin', 'source-tarball': 'src', ===================================== .gitlab/rel_eng/mk-ghcup-metadata/mk_ghcup_metadata.py ===================================== @@ -204,9 +204,9 @@ def mk_new_yaml(release_mode, version, date, pipeline_type, job_map): darwin_x86 = mk(darwin("x86_64")) darwin_arm64 = mk(darwin("aarch64")) windows = mk(windowsArtifact) - alpine3_12 = mk(alpine("3_12")) - alpine3_20 = mk(alpine("3_20")) - alpine3_18_arm64 = mk(alpine("3_18", arch='aarch64')) + alpine3_22 = mk(alpine("3_22")) + alpine3_22_arm64 = mk(alpine("3_22", arch='aarch64')) + alpine3_22_i386 = mk(alpine("3_22", arch='i386')) deb9 = mk(debian(9, "x86_64")) deb10 = mk(debian(10, "x86_64")) deb11 = mk(debian(11, "x86_64")) @@ -247,10 +247,7 @@ def mk_new_yaml(release_mode, version, date, pipeline_type, job_map): , "Linux_UnknownLinux" : { "unknown_versioning": rocky8 } , "Darwin" : { "unknown_versioning" : darwin_x86 } , "Windows" : { "unknown_versioning" : windows } - , "Linux_Alpine" : { "( >= 3.12 && < 3.20 )": alpine3_12 - , ">= 3.20": alpine3_20 - , "unknown_versioning": alpine3_12 } - + , "Linux_Alpine" : { "unknown_versioning": alpine3_22 } } a32 = { "Linux_Debian": { "( >= 10 && < 12 )": deb10_i386 @@ -258,11 +255,12 @@ def mk_new_yaml(release_mode, version, date, pipeline_type, job_map): , "unknown_versioning": deb10_i386 } , "Linux_Ubuntu": { "unknown_versioning": deb10_i386 } , "Linux_Mint" : { "unknown_versioning": deb10_i386 } + , "Linux_Alpine" : { "unknown_versioning": alpine3_22_i386 } , "Linux_UnknownLinux" : { "unknown_versioning": deb10_i386 } } arm64 = { "Linux_UnknownLinux": { "unknown_versioning": deb10_arm64 } - , "Linux_Alpine" : { "unknown_versioning": alpine3_18_arm64 } + , "Linux_Alpine" : { "unknown_versioning": alpine3_22_arm64 } , "Linux_Debian": { "( >= 10 && < 12 )": deb10_arm64 , "( >= 12 )": deb12_arm64 , "unknown_versioning": deb10_arm64 ===================================== testsuite/mk/test.mk ===================================== @@ -124,6 +124,13 @@ else RUNTEST_OPTS += -e ghc_with_dynamic_rts=False endif +ifeq "$(filter debug, $(GhcRTSWays))" "debug" +RUNTEST_OPTS += -e config.debug_rts=True +else +RUNTEST_OPTS += -e config.debug_rts=False +endif + + ifeq "$(GhcWithInterpreter)" "NO" RUNTEST_OPTS += -e config.have_interp=False else ifeq "$(GhcStage)" "1" ===================================== testsuite/tests/ffi/should_run/T1288_c.c ===================================== @@ -3,4 +3,5 @@ void test(int arg) { printf("The argument passed was %i\n", arg ); + fflush(NULL); } ===================================== testsuite/tests/ffi/should_run/T1288_ghci_c.c ===================================== @@ -3,4 +3,5 @@ void test(int arg) { printf("The argument passed was %i\n", arg ); + fflush(NULL); } ===================================== testsuite/tests/ffi/should_run/T2276_c.c ===================================== @@ -3,4 +3,5 @@ void test(int arg) { printf("The argument passed was %i\n", arg ); + fflush(NULL); } ===================================== testsuite/tests/ffi/should_run/T2276_ghci_c.c ===================================== @@ -3,4 +3,5 @@ void test(int arg) { printf("The argument passed was %i\n", arg ); + fflush(NULL); } ===================================== testsuite/tests/ghci/scripts/T7388.hs ===================================== @@ -2,5 +2,7 @@ module T7388 where import Foreign.C +import Foreign.Ptr foreign import capi "stdio.h printf" printfb :: CString -> CInt -> IO () +foreign import capi "stdio.h fflush" fflushb :: Ptr () -> IO () ===================================== testsuite/tests/ghci/scripts/T7388.script ===================================== @@ -1,2 +1,5 @@ :l T7388 withCString "I am a working CApi FFI call\n" $ \str -> printfb str 0 +-- don't forget to flush, otherwise when ghc is statically linked, the C stdout +-- buffer is never flushed. +fflushb nullPtr ===================================== testsuite/tests/th/T16180.hs ===================================== @@ -23,10 +23,19 @@ $(do , "_mydata:" , ".ascii \"Hello world\\0\"" ] +#elif defined(mingw32_HOST_OS) + [ ".global \"mydata\"" + , "mydata:" + , ".ascii \"Hello world\\0\"" + ] #else [ ".global \"mydata\"" , "mydata:" , ".ascii \"Hello world\\0\"" + -- make recent linkers happy by explicitly not requiring an executable + -- stack. Without this section we get: + -- warning: <file>: missing .note.GNU-stack section implies executable stack + , ".section .note.GNU-stack,\"\",@progbits" ] #endif return []) View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/bdbd568cc71a2b2a47d6d4df1e47c75... -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/bdbd568cc71a2b2a47d6d4df1e47c75... You're receiving this email because of your account on gitlab.haskell.org.
participants (1)
-
Marge Bot (＠marge-bot)