Skip to content

Commit 16bcf1e

Browse files
authored
Merge pull request #12 from git-for-windows/wintoast-and-gcm-and-arm64
Prepare for building arm64 versions of the `wintoast` and `git-credential-manager` packages
2 parents 6b1fdd9 + 9afeb53 commit 16bcf1e

File tree

1 file changed

+14
-1
lines changed

1 file changed

+14
-1
lines changed

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

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,20 @@ 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+
)
252+
253+
# No need to rebuild i686/x86_64 flavors when building the initial
254+
# arm64 versions of the wintoast/GCM packages
255+
test ebe6c944c573ee4d8900f0e015365468606c9e1e != "$REF" ||
256+
test "mingw32 mingw64 clangarm64" != "$MINGW_ARCHS_TO_BUILD" ||
257+
MINGW_ARCHS_TO_BUILD=clangarm64
245258
246259
cd "/usr/src/$REPO/$PACKAGE_TO_BUILD" &&
247260
MAKEFLAGS=-j6 PKGEXT='.pkg.tar.xz' MINGW_ARCH=$MINGW_ARCHS_TO_BUILD $MAKEPKG -s --noconfirm &&

0 commit comments

Comments
 (0)