Skip to content

Commit a311b4a

Browse files
committed
build-and-deploy: use hosted runners for wintoast/gcm for ARM64
The wintoast package contains artifacts built using Visual Studio, i.e. we can use an x86_64 host to build an arm64 package. The Git Credential Manager package contains artifacts that are downloaded from that project (i.e. they are not actually built by Git for Windows), so we can use an x86_64 host to build an arm64 package. Therefore, let's special-case these two packages. Signed-off-by: Johannes Schindelin <[email protected]>
1 parent 6b1fdd9 commit a311b4a

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

.github/workflows/build-and-deploy.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,14 @@ jobs:
241241
printf '#!/bin/sh\n\nexec /mingw64/bin/git.exe "$@"\n' >/usr/bin/git
242242
} &&
243243
244-
MINGW_ARCHS_TO_BUILD=$(test "$ARCHITECTURE" == "aarch64" && echo "clangarm64" || echo "mingw32 mingw64")
244+
MINGW_ARCHS_TO_BUILD=$(
245+
case "$ARCHITECTURE,$PACKAGE_TO_BUILD" in
246+
aarch64,*) echo "clangarm64";;
247+
*,mingw-w64-wintoast) echo "mingw32 mingw64 clangarm64";; # We're (cross-)compiling via Visual Studio
248+
*,mingw-w64-git-credential-manager) echo "mingw32 mingw64 clangarm64";; # We're downloading the pre-built x86 artifacts and using them for all three platforms
249+
*) echo "mingw32 mingw64";;
250+
esac
251+
)
245252
246253
cd "/usr/src/$REPO/$PACKAGE_TO_BUILD" &&
247254
MAKEFLAGS=-j6 PKGEXT='.pkg.tar.xz' MINGW_ARCH=$MINGW_ARCHS_TO_BUILD $MAKEPKG -s --noconfirm &&

0 commit comments

Comments
 (0)