From 12d3b66cedd3c80e7c1e030238c92d26631cab8d Mon Sep 17 00:00:00 2001
From: Matthew Pickering <matthewtpickering@gmail.com>
Date: Tue, 16 Jul 2024 12:20:25 +0100
Subject: [PATCH] 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
---
.gitlab/rel_eng/mk-ghcup-metadata/mk_ghcup_metadata.py | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/.gitlab/rel_eng/mk-ghcup-metadata/mk_ghcup_metadata.py b/.gitlab/rel_eng/mk-ghcup-metadata/mk_ghcup_metadata.py
index 47c68e394a84..f3c0deccc141 100755
--- a/.gitlab/rel_eng/mk-ghcup-metadata/mk_ghcup_metadata.py
+++ b/.gitlab/rel_eng/mk-ghcup-metadata/mk_ghcup_metadata.py
@@ -94,19 +94,19 @@ windowsArtifact = PlatformSpec ( 'x86_64-windows'
, 'ghc-{version}-x86_64-unknown-mingw32' )
def centos(n, arch='x86_64'):
- return linux_platform(arch, "x86_64-linux-centos{n}".format(n=n))
+ return linux_platform(arch, "{arch}-linux-centos{n}".format(n=n,arch=arch))
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) )
--
GitLab