Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC Commits: 5b6757d7 by mangoiv at 2026-03-27T17:23:19-04:00 ci: build i386 non-validate for deb12 This is a small fix that will unlock ghcup metadata to run, i386 debian 12 was missing as a job. - - - - - 3 changed files: - .gitlab/generate-ci/gen_ci.hs - .gitlab/jobs.yaml - .gitlab/rel_eng/mk-ghcup-metadata/mk_ghcup_metadata.py Changes: ===================================== .gitlab/generate-ci/gen_ci.hs ===================================== @@ -1173,17 +1173,17 @@ debian_x86 = debian_aarch64 :: [JobGroup Job] debian_aarch64 = - [ - disableValidate (standardBuildsWithConfig AArch64 (Linux Debian11) (splitSectionsBroken vanilla)) - , disableValidate (standardBuildsWithConfig AArch64 (Linux Debian12) (splitSectionsBroken vanilla)) - , fastCI (standardBuildsWithConfig AArch64 (Linux Debian13) (splitSectionsBroken vanilla)) - -- LLVM backend bootstrap - , onlyRule LLVMBackend (validateBuilds AArch64 (Linux Debian13) llvm) + [ disableValidate (standardBuildsWithConfig AArch64 (Linux Debian11) (splitSectionsBroken vanilla)) + , disableValidate (standardBuildsWithConfig AArch64 (Linux Debian12) (splitSectionsBroken vanilla)) + , fastCI (standardBuildsWithConfig AArch64 (Linux Debian13) (splitSectionsBroken vanilla)) + -- LLVM backend bootstrap + , onlyRule LLVMBackend (validateBuilds AArch64 (Linux Debian13) llvm) ] debian_i386 :: [JobGroup Job] debian_i386 = [ disableValidate (standardBuildsWithConfig I386 (Linux Debian11) (splitSectionsBroken vanilla)) + , disableValidate (standardBuildsWithConfig I386 (Linux Debian12) (splitSectionsBroken vanilla)) , addValidateRule I386Backend (standardBuildsWithConfig I386 (Linux Debian13) (splitSectionsBroken vanilla)) ] ===================================== .gitlab/jobs.yaml ===================================== @@ -664,6 +664,68 @@ "TEST_ENV": "i386-linux-deb11-validate" } }, + "i386-linux-deb12-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-i386-linux-deb12-validate.tar.xz", + "junit.xml", + "unexpected-test-output.tar.gz" + ], + "reports": { + "junit": "junit.xml" + }, + "when": "always" + }, + "cache": { + "key": "i386-linux-deb12-$CACHE_REV", + "paths": [ + "cabal-cache", + "toolchain" + ] + }, + "dependencies": [], + "image": "registry.gitlab.haskell.org/ghc/ci-images/i386-linux-deb12:$DOCKER_REV", + "needs": [ + { + "artifacts": false, + "job": "hadrian-ghc-in-ghci" + } + ], + "rules": [ + { + "if": "((($ONLY_JOBS) && ($ONLY_JOBS =~ /.*\\bi386-linux-deb12-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-i386-linux-deb12-validate", + "BUILD_FLAVOUR": "validate", + "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check", + "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check", + "RUNTEST_ARGS": "", + "TEST_ENV": "i386-linux-deb12-validate" + } + }, "i386-linux-deb13-validate": { "after_script": [ ".gitlab/ci.sh save_cache", @@ -1400,6 +1462,69 @@ "XZ_OPT": "-9" } }, + "nightly-i386-linux-deb12-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-i386-linux-deb12-validate.tar.xz", + "junit.xml", + "unexpected-test-output.tar.gz" + ], + "reports": { + "junit": "junit.xml" + }, + "when": "always" + }, + "cache": { + "key": "i386-linux-deb12-$CACHE_REV", + "paths": [ + "cabal-cache", + "toolchain" + ] + }, + "dependencies": [], + "image": "registry.gitlab.haskell.org/ghc/ci-images/i386-linux-deb12:$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-i386-linux-deb12-validate", + "BUILD_FLAVOUR": "validate", + "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check", + "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check", + "RUNTEST_ARGS": "", + "TEST_ENV": "i386-linux-deb12-validate", + "XZ_OPT": "-9" + } + }, "nightly-i386-linux-deb13-validate": { "after_script": [ ".gitlab/ci.sh save_cache", @@ -4156,6 +4281,70 @@ "XZ_OPT": "-9" } }, + "release-i386-linux-deb12-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-i386-linux-deb12-release+no_split_sections.tar.xz", + "junit.xml", + "unexpected-test-output.tar.gz" + ], + "reports": { + "junit": "junit.xml" + }, + "when": "always" + }, + "cache": { + "key": "i386-linux-deb12-$CACHE_REV", + "paths": [ + "cabal-cache", + "toolchain" + ] + }, + "dependencies": [], + "image": "registry.gitlab.haskell.org/ghc/ci-images/i386-linux-deb12:$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-i386-linux-deb12-release+no_split_sections", + "BUILD_FLAVOUR": "release+no_split_sections", + "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check", + "IGNORE_PERF_FAILURES": "all", + "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check", + "RUNTEST_ARGS": "", + "TEST_ENV": "i386-linux-deb12-release+no_split_sections", + "XZ_OPT": "-9" + } + }, "release-i386-linux-deb13-release+no_split_sections": { "after_script": [ ".gitlab/ci.sh save_cache", ===================================== .gitlab/rel_eng/mk-ghcup-metadata/mk_ghcup_metadata.py ===================================== @@ -244,7 +244,8 @@ def mk_new_yaml(release_mode, version, date, pipeline_type, job_map): } a32 = { "Linux_Debian": { "( >= 11 && < 12 )": deb11_i386 - , ">= 12": deb12_i386 + , "( >= 12 && < 13 )": deb12_i386 + , ">= 13": deb13_i386 , "unknown_versioning": deb11_i386 } , "Linux_Ubuntu": { "unknown_versioning": deb11_i386 } , "Linux_Mint" : { "unknown_versioning": deb11_i386 } View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/5b6757d78e4e808678feb740ff5d4eb5... -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/5b6757d78e4e808678feb740ff5d4eb5... You're receiving this email because of your account on gitlab.haskell.org.