Ben Gamari pushed to branch ghc-9.10 at Glasgow Haskell Compiler / GHC Commits: b300f423 by Zubin Duggal at 2025-05-06T17:38:56+05:30 ghcup metadata: fix debian 12+ selection logic - - - - - e761967a by Matthew Pickering at 2025-05-06T17:39:24+05:30 ghcup-metadata: Fix use of arch argument The arch argument was ignored when making the jobname, which lead to failures when generating metadata for the alpine_3_18-aarch64 bindist. Fixes #25089 (cherry picked from commit 12d3b66cedd3c80e7c1e030238c92d26631cab8d) - - - - - 1 changed file: - .gitlab/rel_eng/mk-ghcup-metadata/mk_ghcup_metadata.py Changes: ===================================== .gitlab/rel_eng/mk-ghcup-metadata/mk_ghcup_metadata.py ===================================== @@ -97,16 +97,16 @@ windowsArtifact = PlatformSpec ( 'x86_64-windows' , 'ghc-{version}-x86_64-unknown-mingw32' ) def fedora(n, arch='x86_64'): - return linux_platform(arch, "x86_64-linux-fedora{n}".format(n=n)) + return linux_platform(arch, "{arch}-linux-fedora{n}".format(n=n,arch=arch)) def alpine(n, arch='x86_64'): - return linux_platform(arch, "x86_64-linux-alpine{n}".format(n=n)) + return linux_platform(arch, "{arch}-linux-alpine{n}".format(n=n,arch=arch)) def rocky(n, arch='x86_64'): - return linux_platform(arch, "x86_64-linux-rocky{n}".format(n=n)) + return linux_platform(arch, "{arch}-linux-rocky{n}".format(n=n,arch=arch)) def ubuntu(n, arch='x86_64'): - return linux_platform(arch, "x86_64-linux-ubuntu{n}".format(n=n)) + return linux_platform(arch, "{arch}-linux-ubuntu{n}".format(n=n,arch=arch)) def linux_platform(arch, opsys): return PlatformSpec( opsys, 'ghc-{version}-{arch}-unknown-linux'.format(version="{version}", arch=arch) ) @@ -216,7 +216,7 @@ def mk_new_yaml(release_mode, version, date, pipeline_type, job_map) -> object: a64 = { "Linux_Debian": { "< 10": deb9 , "( >= 10 && < 11 )": deb10 , "( >= 11 && < 12 )": deb11 - , ">= 11": deb12 + , ">= 12": deb12 , "unknown_versioning": deb11 } , "Linux_Ubuntu" : { "unknown_versioning": ubuntu2004 , "( >= 16 && < 18 )": deb9 View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/c9de16b57adcb6810d059ebd1c72d97... -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/c9de16b57adcb6810d059ebd1c72d97... You're receiving this email because of your account on gitlab.haskell.org.