Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC Commits: 2c378ad2 by Cheng Shao at 2025-09-19T05:17:33-04:00 rel-eng: update fedora image to 42 This patch is a part of #25876 and updates fedora image to 42. - - - - - 5 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 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: be4ac2cd18f38e63b263e2a27c76a7c279385796 + DOCKER_REV: a97d5c67d803c6b3811c6cccdf33dc8e9d7eafe3 # Sequential version number of all cached things. # Bump to invalidate GitLab CI cache. @@ -433,14 +433,14 @@ hadrian-ghc-in-ghci: hadrian-multi: stage: testing needs: - - job: x86_64-linux-fedora33-release + - job: x86_64-linux-fedora42-release optional: true - - job: nightly-x86_64-linux-fedora33-release + - job: nightly-x86_64-linux-fedora42-release optional: true - - job: release-x86_64-linux-fedora33-release + - job: release-x86_64-linux-fedora42-release optional: true dependencies: null - image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-fedora33:$DOCKER_REV" + image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-fedora42:$DOCKER_REV" before_script: # workaround for docker permissions - sudo chown ghc:ghc -R . @@ -460,7 +460,7 @@ hadrian-multi: - ls - | mkdir tmp - tar -xf ghc-x86_64-linux-fedora33-release.tar.xz -C tmp + tar -xf ghc-x86_64-linux-fedora42-release.tar.xz -C tmp pushd tmp/ghc-*/ ./configure --prefix=$root make install @@ -522,17 +522,17 @@ test-cabal-reinstall-x86_64-linux-deb10: abi-test-nightly: stage: full-build needs: - - job: nightly-x86_64-linux-fedora33-release-hackage - - job: nightly-x86_64-linux-fedora33-release + - job: nightly-x86_64-linux-fedora42-release-hackage + - job: nightly-x86_64-linux-fedora42-release tags: - x86_64-linux - image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-fedora33:$DOCKER_REV" + image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-fedora42:$DOCKER_REV" dependencies: null before_script: - mkdir -p normal - mkdir -p hackage - - tar -xf ghc-x86_64-linux-fedora33-release.tar.xz -C normal/ - - tar -xf ghc-x86_64-linux-fedora33-release-hackage_docs.tar.xz -C hackage/ + - tar -xf ghc-x86_64-linux-fedora42-release.tar.xz -C normal/ + - tar -xf ghc-x86_64-linux-fedora42-release-hackage_docs.tar.xz -C hackage/ script: - .gitlab/ci.sh compare_interfaces_of "normal/ghc-*" "hackage/ghc-*" artifacts: @@ -609,9 +609,9 @@ doc-tarball: hackage-doc-tarball: stage: packaging needs: - - job: nightly-x86_64-linux-fedora33-release-hackage + - job: nightly-x86_64-linux-fedora42-release-hackage optional: true - - job: release-x86_64-linux-fedora33-release-hackage + - job: release-x86_64-linux-fedora42-release-hackage optional: true - job: source-tarball tags: @@ -628,7 +628,7 @@ hackage-doc-tarball: - hackage_docs before_script: - tar -xf ghc-*[0-9]-src.tar.xz - - tar -xf ghc-x86_64-linux-fedora33-release.tar.xz -C ghc*/ + - tar -xf ghc-x86_64-linux-fedora42-release.tar.xz -C ghc*/ script: - cd ghc*/ - mv .gitlab/rel_eng/upload_ghc_libs.py . @@ -754,7 +754,7 @@ test-bootstrap: # Triggering jobs in the ghc/head.hackage project requires that we have a job # token for that repository. Furthermore the head.hackage CI job must have # access to an unprivileged access token with the ability to query the ghc/ghc -# project such that it can find the job ID of the fedora33 job for the current +# project such that it can find the job ID of the fedora42 job for the current # pipeline. # # hackage-lint: Can be triggered on any MR, normal validate pipeline or nightly build. @@ -841,7 +841,7 @@ nightly-hackage-lint: nightly-hackage-perf: needs: - - job: nightly-x86_64-linux-fedora33-release + - job: nightly-x86_64-linux-fedora42-release optional: true artifacts: false - job: nightly-aarch64-linux-deb12-validate @@ -860,7 +860,7 @@ nightly-hackage-perf: release-hackage-lint: needs: - - job: release-x86_64-linux-fedora33-release + - job: release-x86_64-linux-fedora42-release optional: true artifacts: false - job: release-aarch64-linux-deb12-release+no_split_sections @@ -946,13 +946,13 @@ perf-nofib: allow_failure: true stage: testing needs: - - job: x86_64-linux-fedora33-release + - job: x86_64-linux-fedora42-release optional: true - - job: nightly-x86_64-linux-fedora33-release + - job: nightly-x86_64-linux-fedora42-release optional: true - - job: release-x86_64-linux-fedora33-release + - job: release-x86_64-linux-fedora42-release optional: true - image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-fedora33:$DOCKER_REV" + image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-fedora42:$DOCKER_REV" rules: - when: never - *full-ci @@ -965,7 +965,7 @@ perf-nofib: - root=$(pwd)/ghc - | mkdir tmp - tar -xf ../ghc-x86_64-linux-fedora33-release.tar.xz -C tmp + tar -xf ../ghc-x86_64-linux-fedora42-release.tar.xz -C tmp pushd tmp/ghc-*/ ./configure --prefix=$root make install @@ -989,21 +989,24 @@ perf-nofib: perf: stage: testing needs: - - job: x86_64-linux-fedora33-release + - job: x86_64-linux-fedora42-release optional: true - - job: nightly-x86_64-linux-fedora33-release + - job: nightly-x86_64-linux-fedora42-release optional: true - - job: release-x86_64-linux-fedora33-release + - job: release-x86_64-linux-fedora42-release optional: true dependencies: null - image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-fedora33:$DOCKER_REV" + image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-fedora42:$DOCKER_REV" tags: - x86_64-linux-perf + before_script: + # workaround for docker permissions + - sudo chown ghc:ghc -R . script: - root=$(pwd)/ghc - | mkdir tmp - tar -xf ghc-x86_64-linux-fedora33-release.tar.xz -C tmp + tar -xf ghc-x86_64-linux-fedora42-release.tar.xz -C tmp pushd tmp/ghc-*/ ./configure --prefix=$root make install @@ -1027,14 +1030,14 @@ perf: abi-test: stage: testing needs: - - job: x86_64-linux-fedora33-release + - job: x86_64-linux-fedora42-release optional: true - - job: nightly-x86_64-linux-fedora33-release + - job: nightly-x86_64-linux-fedora42-release optional: true - - job: release-x86_64-linux-fedora33-release + - job: release-x86_64-linux-fedora42-release optional: true dependencies: null - image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-fedora33:$DOCKER_REV" + image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-fedora42:$DOCKER_REV" rules: - if: $CI_MERGE_REQUEST_ID - if: '$CI_COMMIT_BRANCH == "master"' @@ -1045,7 +1048,7 @@ abi-test: - root=$(pwd)/ghc - | mkdir tmp - tar -xf ghc-x86_64-linux-fedora33-release.tar.xz -C tmp + tar -xf ghc-x86_64-linux-fedora42-release.tar.xz -C tmp pushd tmp/ghc-*/ ./configure --prefix=$root make install @@ -1200,7 +1203,7 @@ ghcup-metadata-nightly: extends: .ghcup-metadata # Explicit needs for validate pipeline because we only need certain bindists needs: - - job: nightly-x86_64-linux-fedora33-release + - job: nightly-x86_64-linux-fedora42-release artifacts: false - job: nightly-x86_64-linux-ubuntu24_04-validate artifacts: false @@ -1251,7 +1254,7 @@ ghcup-metadata-nightly: # Update the ghcup metadata with information about this nightly pipeline ghcup-metadata-nightly-push: stage: deploy - image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-fedora33:$DOCKER_REV" + image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-fedora42:$DOCKER_REV" dependencies: null tags: - x86_64-linux ===================================== .gitlab/generate-ci/gen_ci.hs ===================================== @@ -82,7 +82,7 @@ The generated names for the jobs is important as there are a few downstream cons of the jobs artifacts. Therefore some care should be taken if changing the generated names of jobs to update these other places. -1. Fedora33 jobs are required by head.hackage +1. fedora42 jobs are required by head.hackage 2. The fetch-gitlab release utility pulls release artifacts from the 3. The ghc-head-from script downloads release artifacts based on a pipeline change. 4. Some subsequent CI jobs have explicit dependencies (for example docs-tarball, perf, perf-nofib) @@ -118,8 +118,7 @@ data LinuxDistro | Debian11Js | Debian10 | Debian9 - | Fedora33 - | Fedora38 + | Fedora42 | Ubuntu2404LoongArch64 | Ubuntu2404 | Ubuntu2204 @@ -319,8 +318,7 @@ distroName Debian12Riscv = "deb12-riscv" distroName Debian12Wine = "deb12-wine" distroName Debian10 = "deb10" distroName Debian9 = "deb9" -distroName Fedora33 = "fedora33" -distroName Fedora38 = "fedora38" +distroName Fedora42 = "fedora42" distroName Ubuntu2404LoongArch64 = "ubuntu24_04-loongarch" distroName Ubuntu1804 = "ubuntu18_04" distroName Ubuntu2004 = "ubuntu20_04" @@ -501,14 +499,6 @@ alpineVariables arch = mconcat $ distroVariables :: Arch -> LinuxDistro -> Variables distroVariables arch Alpine312 = 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 - -- +/opt/llvm/bin/opt: /lib64/libtinfo.so.5: no version information available (required by /opt/llvm/bin/opt) - -- +/opt/llvm/bin/llc: /lib64/libtinfo.so.5: no version information available (required by /opt/llvm/bin/llc) - [ "LLC" =: "/bin/false" - , "OPT" =: "/bin/false" - ] distroVariables _ _ = mempty ----------------------------------------------------------------------------- @@ -1207,13 +1197,13 @@ rhel_x86 = fedora_x86 :: [JobGroup Job] fedora_x86 = - [ -- Fedora33 job is always built with perf so there's one job in the normal + [ -- Fedora42 job is always built with perf so there's one job in the normal -- validate pipeline which is built with perf. - fastCI (standardBuildsWithConfig Amd64 (Linux Fedora33) releaseConfig) + fastCI (standardBuildsWithConfig Amd64 (Linux Fedora42) releaseConfig) -- This job is only for generating head.hackage docs - , hackage_doc_job (disableValidate (standardBuildsWithConfig Amd64 (Linux Fedora33) releaseConfig)) - , disableValidate (standardBuildsWithConfig Amd64 (Linux Fedora33) dwarf) - , disableValidate (standardBuilds Amd64 (Linux Fedora38)) + , hackage_doc_job (disableValidate (standardBuildsWithConfig Amd64 (Linux Fedora42) releaseConfig)) + , disableValidate (standardBuildsWithConfig Amd64 (Linux Fedora42) dwarf) + , disableValidate (standardBuilds Amd64 (Linux Fedora42)) ] where hackage_doc_job = rename (<> "-hackage") . modifyJobs (addVariable "HADRIAN_ARGS" "--haddock-for-hackage") @@ -1375,7 +1365,7 @@ platform_mapping = Map.map go combined_result , "x86_64-linux-deb11-validate" , "x86_64-linux-deb12-validate" , "x86_64-linux-deb10-validate+debug_info" - , "x86_64-linux-fedora33-release" + , "x86_64-linux-fedora42-release" , "x86_64-linux-deb11-cross_aarch64-linux-gnu-validate" , "x86_64-windows-validate" , "aarch64-linux-deb12-validate" @@ -1390,13 +1380,13 @@ platform_mapping = Map.map go combined_result , "nightly-aarch64-linux-deb12-wine-int_native-cross_aarch64-unknown-mingw32-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-linux-fedora42-release" , "nightly-x86_64-windows-validate" , "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" - , "release-x86_64-linux-fedora33-release" + , "release-x86_64-linux-fedora42-release" , "release-x86_64-windows-release" ] ===================================== .gitlab/jobs.yaml ===================================== @@ -2942,7 +2942,7 @@ "XZ_OPT": "-9" } }, - "nightly-x86_64-linux-fedora33-release": { + "nightly-x86_64-linux-fedora42-release": { "after_script": [ ".gitlab/ci.sh save_cache", ".gitlab/ci.sh save_test_output", @@ -2953,7 +2953,7 @@ "artifacts": { "expire_in": "8 weeks", "paths": [ - "ghc-x86_64-linux-fedora33-release.tar.xz", + "ghc-x86_64-linux-fedora42-release.tar.xz", "junit.xml", "unexpected-test-output.tar.gz" ], @@ -2963,14 +2963,14 @@ "when": "always" }, "cache": { - "key": "x86_64-linux-fedora33-$CACHE_REV", + "key": "x86_64-linux-fedora42-$CACHE_REV", "paths": [ "cabal-cache", "toolchain" ] }, "dependencies": [], - "image": "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-fedora33:$DOCKER_REV", + "image": "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-fedora42:$DOCKER_REV", "needs": [ { "artifacts": false, @@ -2996,18 +2996,16 @@ ], "variables": { "BIGNUM_BACKEND": "gmp", - "BIN_DIST_NAME": "ghc-x86_64-linux-fedora33-release", + "BIN_DIST_NAME": "ghc-x86_64-linux-fedora42-release", "BUILD_FLAVOUR": "release", "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check", "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check", - "LLC": "/bin/false", - "OPT": "/bin/false", "RUNTEST_ARGS": "", - "TEST_ENV": "x86_64-linux-fedora33-release", + "TEST_ENV": "x86_64-linux-fedora42-release", "XZ_OPT": "-9" } }, - "nightly-x86_64-linux-fedora33-release-hackage": { + "nightly-x86_64-linux-fedora42-release-hackage": { "after_script": [ ".gitlab/ci.sh save_cache", ".gitlab/ci.sh save_test_output", @@ -3018,7 +3016,7 @@ "artifacts": { "expire_in": "8 weeks", "paths": [ - "ghc-x86_64-linux-fedora33-release.tar.xz", + "ghc-x86_64-linux-fedora42-release.tar.xz", "junit.xml", "unexpected-test-output.tar.gz" ], @@ -3028,14 +3026,14 @@ "when": "always" }, "cache": { - "key": "x86_64-linux-fedora33-$CACHE_REV", + "key": "x86_64-linux-fedora42-$CACHE_REV", "paths": [ "cabal-cache", "toolchain" ] }, "dependencies": [], - "image": "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-fedora33:$DOCKER_REV", + "image": "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-fedora42:$DOCKER_REV", "needs": [ { "artifacts": false, @@ -3061,19 +3059,17 @@ ], "variables": { "BIGNUM_BACKEND": "gmp", - "BIN_DIST_NAME": "ghc-x86_64-linux-fedora33-release", + "BIN_DIST_NAME": "ghc-x86_64-linux-fedora42-release", "BUILD_FLAVOUR": "release", "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check", "HADRIAN_ARGS": "--haddock-for-hackage", "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check", - "LLC": "/bin/false", - "OPT": "/bin/false", "RUNTEST_ARGS": "", - "TEST_ENV": "x86_64-linux-fedora33-release", + "TEST_ENV": "x86_64-linux-fedora42-release", "XZ_OPT": "-9" } }, - "nightly-x86_64-linux-fedora33-validate+debug_info": { + "nightly-x86_64-linux-fedora42-validate": { "after_script": [ ".gitlab/ci.sh save_cache", ".gitlab/ci.sh save_test_output", @@ -3084,7 +3080,7 @@ "artifacts": { "expire_in": "8 weeks", "paths": [ - "ghc-x86_64-linux-fedora33-validate+debug_info.tar.xz", + "ghc-x86_64-linux-fedora42-validate.tar.xz", "junit.xml", "unexpected-test-output.tar.gz" ], @@ -3094,14 +3090,14 @@ "when": "always" }, "cache": { - "key": "x86_64-linux-fedora33-$CACHE_REV", + "key": "x86_64-linux-fedora42-$CACHE_REV", "paths": [ "cabal-cache", "toolchain" ] }, "dependencies": [], - "image": "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-fedora33:$DOCKER_REV", + "image": "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-fedora42:$DOCKER_REV", "needs": [ { "artifacts": false, @@ -3127,18 +3123,16 @@ ], "variables": { "BIGNUM_BACKEND": "gmp", - "BIN_DIST_NAME": "ghc-x86_64-linux-fedora33-validate+debug_info", - "BUILD_FLAVOUR": "validate+debug_info", + "BIN_DIST_NAME": "ghc-x86_64-linux-fedora42-validate", + "BUILD_FLAVOUR": "validate", "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check", "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check", - "LLC": "/bin/false", - "OPT": "/bin/false", "RUNTEST_ARGS": "", - "TEST_ENV": "x86_64-linux-fedora33-validate+debug_info", + "TEST_ENV": "x86_64-linux-fedora42-validate", "XZ_OPT": "-9" } }, - "nightly-x86_64-linux-fedora38-validate": { + "nightly-x86_64-linux-fedora42-validate+debug_info": { "after_script": [ ".gitlab/ci.sh save_cache", ".gitlab/ci.sh save_test_output", @@ -3149,7 +3143,7 @@ "artifacts": { "expire_in": "8 weeks", "paths": [ - "ghc-x86_64-linux-fedora38-validate.tar.xz", + "ghc-x86_64-linux-fedora42-validate+debug_info.tar.xz", "junit.xml", "unexpected-test-output.tar.gz" ], @@ -3159,14 +3153,14 @@ "when": "always" }, "cache": { - "key": "x86_64-linux-fedora38-$CACHE_REV", + "key": "x86_64-linux-fedora42-$CACHE_REV", "paths": [ "cabal-cache", "toolchain" ] }, "dependencies": [], - "image": "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-fedora38:$DOCKER_REV", + "image": "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-fedora42:$DOCKER_REV", "needs": [ { "artifacts": false, @@ -3192,12 +3186,12 @@ ], "variables": { "BIGNUM_BACKEND": "gmp", - "BIN_DIST_NAME": "ghc-x86_64-linux-fedora38-validate", - "BUILD_FLAVOUR": "validate", + "BIN_DIST_NAME": "ghc-x86_64-linux-fedora42-validate+debug_info", + "BUILD_FLAVOUR": "validate+debug_info", "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check", "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check", "RUNTEST_ARGS": "", - "TEST_ENV": "x86_64-linux-fedora38-validate", + "TEST_ENV": "x86_64-linux-fedora42-validate+debug_info", "XZ_OPT": "-9" } }, @@ -4814,7 +4808,7 @@ "XZ_OPT": "-9" } }, - "release-x86_64-linux-fedora33-release": { + "release-x86_64-linux-fedora42-release": { "after_script": [ ".gitlab/ci.sh save_cache", ".gitlab/ci.sh save_test_output", @@ -4825,7 +4819,7 @@ "artifacts": { "expire_in": "1 year", "paths": [ - "ghc-x86_64-linux-fedora33-release.tar.xz", + "ghc-x86_64-linux-fedora42-release.tar.xz", "junit.xml", "unexpected-test-output.tar.gz" ], @@ -4835,14 +4829,14 @@ "when": "always" }, "cache": { - "key": "x86_64-linux-fedora33-$CACHE_REV", + "key": "x86_64-linux-fedora42-$CACHE_REV", "paths": [ "cabal-cache", "toolchain" ] }, "dependencies": [], - "image": "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-fedora33:$DOCKER_REV", + "image": "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-fedora42:$DOCKER_REV", "needs": [ { "artifacts": false, @@ -4868,19 +4862,17 @@ ], "variables": { "BIGNUM_BACKEND": "gmp", - "BIN_DIST_NAME": "ghc-x86_64-linux-fedora33-release", + "BIN_DIST_NAME": "ghc-x86_64-linux-fedora42-release", "BUILD_FLAVOUR": "release", "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check", "IGNORE_PERF_FAILURES": "all", "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check", - "LLC": "/bin/false", - "OPT": "/bin/false", "RUNTEST_ARGS": "", - "TEST_ENV": "x86_64-linux-fedora33-release", + "TEST_ENV": "x86_64-linux-fedora42-release", "XZ_OPT": "-9" } }, - "release-x86_64-linux-fedora33-release+debug_info": { + "release-x86_64-linux-fedora42-release+debug_info": { "after_script": [ ".gitlab/ci.sh save_cache", ".gitlab/ci.sh save_test_output", @@ -4891,7 +4883,7 @@ "artifacts": { "expire_in": "1 year", "paths": [ - "ghc-x86_64-linux-fedora33-release+debug_info.tar.xz", + "ghc-x86_64-linux-fedora42-release+debug_info.tar.xz", "junit.xml", "unexpected-test-output.tar.gz" ], @@ -4901,14 +4893,14 @@ "when": "always" }, "cache": { - "key": "x86_64-linux-fedora33-$CACHE_REV", + "key": "x86_64-linux-fedora42-$CACHE_REV", "paths": [ "cabal-cache", "toolchain" ] }, "dependencies": [], - "image": "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-fedora33:$DOCKER_REV", + "image": "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-fedora42:$DOCKER_REV", "needs": [ { "artifacts": false, @@ -4934,19 +4926,17 @@ ], "variables": { "BIGNUM_BACKEND": "gmp", - "BIN_DIST_NAME": "ghc-x86_64-linux-fedora33-release+debug_info", + "BIN_DIST_NAME": "ghc-x86_64-linux-fedora42-release+debug_info", "BUILD_FLAVOUR": "release+debug_info", "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check", "IGNORE_PERF_FAILURES": "all", "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check", - "LLC": "/bin/false", - "OPT": "/bin/false", "RUNTEST_ARGS": "", - "TEST_ENV": "x86_64-linux-fedora33-release+debug_info", + "TEST_ENV": "x86_64-linux-fedora42-release+debug_info", "XZ_OPT": "-9" } }, - "release-x86_64-linux-fedora33-release-hackage": { + "release-x86_64-linux-fedora42-release-hackage": { "after_script": [ ".gitlab/ci.sh save_cache", ".gitlab/ci.sh save_test_output", @@ -4957,7 +4947,7 @@ "artifacts": { "expire_in": "1 year", "paths": [ - "ghc-x86_64-linux-fedora33-release.tar.xz", + "ghc-x86_64-linux-fedora42-release.tar.xz", "junit.xml", "unexpected-test-output.tar.gz" ], @@ -4967,14 +4957,14 @@ "when": "always" }, "cache": { - "key": "x86_64-linux-fedora33-$CACHE_REV", + "key": "x86_64-linux-fedora42-$CACHE_REV", "paths": [ "cabal-cache", "toolchain" ] }, "dependencies": [], - "image": "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-fedora33:$DOCKER_REV", + "image": "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-fedora42:$DOCKER_REV", "needs": [ { "artifacts": false, @@ -5000,80 +4990,14 @@ ], "variables": { "BIGNUM_BACKEND": "gmp", - "BIN_DIST_NAME": "ghc-x86_64-linux-fedora33-release", + "BIN_DIST_NAME": "ghc-x86_64-linux-fedora42-release", "BUILD_FLAVOUR": "release", "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check", "HADRIAN_ARGS": "--haddock-for-hackage", "IGNORE_PERF_FAILURES": "all", "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check", - "LLC": "/bin/false", - "OPT": "/bin/false", - "RUNTEST_ARGS": "", - "TEST_ENV": "x86_64-linux-fedora33-release", - "XZ_OPT": "-9" - } - }, - "release-x86_64-linux-fedora38-release": { - "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-fedora38-release.tar.xz", - "junit.xml", - "unexpected-test-output.tar.gz" - ], - "reports": { - "junit": "junit.xml" - }, - "when": "always" - }, - "cache": { - "key": "x86_64-linux-fedora38-$CACHE_REV", - "paths": [ - "cabal-cache", - "toolchain" - ] - }, - "dependencies": [], - "image": "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-fedora38:$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-fedora38-release", - "BUILD_FLAVOUR": "release", - "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check", - "IGNORE_PERF_FAILURES": "all", - "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check", "RUNTEST_ARGS": "", - "TEST_ENV": "x86_64-linux-fedora38-release", + "TEST_ENV": "x86_64-linux-fedora42-release", "XZ_OPT": "-9" } }, @@ -7108,7 +7032,7 @@ "TEST_ENV": "x86_64-linux-deb9-validate" } }, - "x86_64-linux-fedora33-release": { + "x86_64-linux-fedora42-release": { "after_script": [ ".gitlab/ci.sh save_cache", ".gitlab/ci.sh save_test_output", @@ -7119,7 +7043,7 @@ "artifacts": { "expire_in": "2 weeks", "paths": [ - "ghc-x86_64-linux-fedora33-release.tar.xz", + "ghc-x86_64-linux-fedora42-release.tar.xz", "junit.xml", "unexpected-test-output.tar.gz" ], @@ -7129,14 +7053,14 @@ "when": "always" }, "cache": { - "key": "x86_64-linux-fedora33-$CACHE_REV", + "key": "x86_64-linux-fedora42-$CACHE_REV", "paths": [ "cabal-cache", "toolchain" ] }, "dependencies": [], - "image": "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-fedora33:$DOCKER_REV", + "image": "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-fedora42:$DOCKER_REV", "needs": [ { "artifacts": false, @@ -7145,7 +7069,7 @@ ], "rules": [ { - "if": "((($ONLY_JOBS) && ($ONLY_JOBS =~ /.*\\bx86_64-linux-fedora33-release(\\s|$).*/)) || (($ONLY_JOBS == null) && ((\"true\" == \"true\")))) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY == null)", + "if": "((($ONLY_JOBS) && ($ONLY_JOBS =~ /.*\\bx86_64-linux-fedora42-release(\\s|$).*/)) || (($ONLY_JOBS == null) && ((\"true\" == \"true\")))) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY == null)", "when": "on_success" } ], @@ -7162,17 +7086,15 @@ ], "variables": { "BIGNUM_BACKEND": "gmp", - "BIN_DIST_NAME": "ghc-x86_64-linux-fedora33-release", + "BIN_DIST_NAME": "ghc-x86_64-linux-fedora42-release", "BUILD_FLAVOUR": "release", "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check", "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check", - "LLC": "/bin/false", - "OPT": "/bin/false", "RUNTEST_ARGS": "", - "TEST_ENV": "x86_64-linux-fedora33-release" + "TEST_ENV": "x86_64-linux-fedora42-release" } }, - "x86_64-linux-fedora33-release-hackage": { + "x86_64-linux-fedora42-release-hackage": { "after_script": [ ".gitlab/ci.sh save_cache", ".gitlab/ci.sh save_test_output", @@ -7183,7 +7105,7 @@ "artifacts": { "expire_in": "2 weeks", "paths": [ - "ghc-x86_64-linux-fedora33-release.tar.xz", + "ghc-x86_64-linux-fedora42-release.tar.xz", "junit.xml", "unexpected-test-output.tar.gz" ], @@ -7193,14 +7115,14 @@ "when": "always" }, "cache": { - "key": "x86_64-linux-fedora33-$CACHE_REV", + "key": "x86_64-linux-fedora42-$CACHE_REV", "paths": [ "cabal-cache", "toolchain" ] }, "dependencies": [], - "image": "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-fedora33:$DOCKER_REV", + "image": "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-fedora42:$DOCKER_REV", "needs": [ { "artifacts": false, @@ -7209,7 +7131,7 @@ ], "rules": [ { - "if": "((($ONLY_JOBS) && ($ONLY_JOBS =~ /.*\\bx86_64-linux-fedora33-release(\\s|$).*/)) || (($ONLY_JOBS == null) && (\"disabled\" != \"disabled\"))) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY == null)", + "if": "((($ONLY_JOBS) && ($ONLY_JOBS =~ /.*\\bx86_64-linux-fedora42-release(\\s|$).*/)) || (($ONLY_JOBS == null) && (\"disabled\" != \"disabled\"))) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY == null)", "when": "on_success" } ], @@ -7226,18 +7148,16 @@ ], "variables": { "BIGNUM_BACKEND": "gmp", - "BIN_DIST_NAME": "ghc-x86_64-linux-fedora33-release", + "BIN_DIST_NAME": "ghc-x86_64-linux-fedora42-release", "BUILD_FLAVOUR": "release", "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check", "HADRIAN_ARGS": "--haddock-for-hackage", "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check", - "LLC": "/bin/false", - "OPT": "/bin/false", "RUNTEST_ARGS": "", - "TEST_ENV": "x86_64-linux-fedora33-release" + "TEST_ENV": "x86_64-linux-fedora42-release" } }, - "x86_64-linux-fedora33-validate+debug_info": { + "x86_64-linux-fedora42-validate": { "after_script": [ ".gitlab/ci.sh save_cache", ".gitlab/ci.sh save_test_output", @@ -7248,7 +7168,7 @@ "artifacts": { "expire_in": "2 weeks", "paths": [ - "ghc-x86_64-linux-fedora33-validate+debug_info.tar.xz", + "ghc-x86_64-linux-fedora42-validate.tar.xz", "junit.xml", "unexpected-test-output.tar.gz" ], @@ -7258,14 +7178,14 @@ "when": "always" }, "cache": { - "key": "x86_64-linux-fedora33-$CACHE_REV", + "key": "x86_64-linux-fedora42-$CACHE_REV", "paths": [ "cabal-cache", "toolchain" ] }, "dependencies": [], - "image": "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-fedora33:$DOCKER_REV", + "image": "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-fedora42:$DOCKER_REV", "needs": [ { "artifacts": false, @@ -7274,7 +7194,7 @@ ], "rules": [ { - "if": "((($ONLY_JOBS) && ($ONLY_JOBS =~ /.*\\bx86_64-linux-fedora33-validate\\+debug_info(\\s|$).*/)) || (($ONLY_JOBS == null) && (\"disabled\" != \"disabled\"))) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY == null)", + "if": "((($ONLY_JOBS) && ($ONLY_JOBS =~ /.*\\bx86_64-linux-fedora42-validate(\\s|$).*/)) || (($ONLY_JOBS == null) && (\"disabled\" != \"disabled\"))) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY == null)", "when": "on_success" } ], @@ -7291,17 +7211,15 @@ ], "variables": { "BIGNUM_BACKEND": "gmp", - "BIN_DIST_NAME": "ghc-x86_64-linux-fedora33-validate+debug_info", - "BUILD_FLAVOUR": "validate+debug_info", + "BIN_DIST_NAME": "ghc-x86_64-linux-fedora42-validate", + "BUILD_FLAVOUR": "validate", "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check", "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check", - "LLC": "/bin/false", - "OPT": "/bin/false", "RUNTEST_ARGS": "", - "TEST_ENV": "x86_64-linux-fedora33-validate+debug_info" + "TEST_ENV": "x86_64-linux-fedora42-validate" } }, - "x86_64-linux-fedora38-validate": { + "x86_64-linux-fedora42-validate+debug_info": { "after_script": [ ".gitlab/ci.sh save_cache", ".gitlab/ci.sh save_test_output", @@ -7312,7 +7230,7 @@ "artifacts": { "expire_in": "2 weeks", "paths": [ - "ghc-x86_64-linux-fedora38-validate.tar.xz", + "ghc-x86_64-linux-fedora42-validate+debug_info.tar.xz", "junit.xml", "unexpected-test-output.tar.gz" ], @@ -7322,14 +7240,14 @@ "when": "always" }, "cache": { - "key": "x86_64-linux-fedora38-$CACHE_REV", + "key": "x86_64-linux-fedora42-$CACHE_REV", "paths": [ "cabal-cache", "toolchain" ] }, "dependencies": [], - "image": "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-fedora38:$DOCKER_REV", + "image": "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-fedora42:$DOCKER_REV", "needs": [ { "artifacts": false, @@ -7338,7 +7256,7 @@ ], "rules": [ { - "if": "((($ONLY_JOBS) && ($ONLY_JOBS =~ /.*\\bx86_64-linux-fedora38-validate(\\s|$).*/)) || (($ONLY_JOBS == null) && (\"disabled\" != \"disabled\"))) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY == null)", + "if": "((($ONLY_JOBS) && ($ONLY_JOBS =~ /.*\\bx86_64-linux-fedora42-validate\\+debug_info(\\s|$).*/)) || (($ONLY_JOBS == null) && (\"disabled\" != \"disabled\"))) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY == null)", "when": "on_success" } ], @@ -7355,12 +7273,12 @@ ], "variables": { "BIGNUM_BACKEND": "gmp", - "BIN_DIST_NAME": "ghc-x86_64-linux-fedora38-validate", - "BUILD_FLAVOUR": "validate", + "BIN_DIST_NAME": "ghc-x86_64-linux-fedora42-validate+debug_info", + "BUILD_FLAVOUR": "validate+debug_info", "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check", "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check", "RUNTEST_ARGS": "", - "TEST_ENV": "x86_64-linux-fedora38-validate" + "TEST_ENV": "x86_64-linux-fedora42-validate+debug_info" } }, "x86_64-linux-rocky8-validate": { ===================================== .gitlab/rel_eng/fetch-gitlab-artifacts/fetch_gitlab.py ===================================== @@ -23,10 +23,8 @@ def job_triple(job_name): 'release-x86_64-linux-ubuntu22_04-release': 'x86_64-ubuntu22_04-linux', 'release-x86_64-linux-ubuntu20_04-release': 'x86_64-ubuntu20_04-linux', 'release-x86_64-linux-ubuntu18_04-release': 'x86_64-ubuntu18_04-linux', - 'release-x86_64-linux-fedora38-release': 'x86_64-fedora38-linux', - 'release-x86_64-linux-fedora33-release+debug_info': 'x86_64-fedora33-linux-dwarf', - 'release-x86_64-linux-fedora33-release': 'x86_64-fedora33-linux', - 'release-x86_64-linux-fedora27-release': 'x86_64-fedora27-linux', + 'release-x86_64-linux-fedora42-release': 'x86_64-fedora42-linux', + 'release-x86_64-linux-fedora42-release+debug_info': 'x86_64-fedora42-linux-dwarf', 'release-x86_64-linux-deb12-release': 'x86_64-deb12-linux', 'release-x86_64-linux-deb11-release': 'x86_64-deb11-linux', 'release-x86_64-linux-deb10-release+debug_info': 'x86_64-deb10-linux-dwarf', ===================================== .gitlab/rel_eng/mk-ghcup-metadata/mk_ghcup_metadata.py ===================================== @@ -200,7 +200,7 @@ def mk_new_yaml(release_mode, version, date, pipeline_type, job_map): ubuntu2204 = mk(ubuntu("22_04")) ubuntu2404 = mk(ubuntu("24_04")) rocky8 = mk(rocky("8")) - fedora33 = mk(fedora(33)) + fedora42 = mk(fedora(42)) darwin_x86 = mk(darwin("x86_64")) darwin_arm64 = mk(darwin("aarch64")) windows = mk(windowsArtifact) @@ -239,11 +239,9 @@ def mk_new_yaml(release_mode, version, date, pipeline_type, job_map): , "unknown_versioning": ubuntu2004 } , "Linux_CentOS" : { "( >= 8 && < 9 )" : rocky8 , "unknown_versioning" : rocky8 } - , "Linux_Fedora" : { ">= 33": fedora33 + , "Linux_Fedora" : { ">= 42": fedora42 , "unknown_versioning": rocky8 } - , "Linux_RedHat" : { "< 9": rocky8 - , ">= 9": fedora33 - , "unknown_versioning": fedora33 } + , "Linux_RedHat" : { "unknown_versioning": rocky8 } , "Linux_UnknownLinux" : { "unknown_versioning": rocky8 } , "Darwin" : { "unknown_versioning" : darwin_x86 } , "Windows" : { "unknown_versioning" : windows } View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/2c378ad22a4f0426b29194ebc5b07980... -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/2c378ad22a4f0426b29194ebc5b07980... You're receiving this email because of your account on gitlab.haskell.org.