Skip to content

Support building and deploying UCRT64 packages #178

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dscho merged 4 commits into from
Jun 17, 2026
Merged

Support building and deploying UCRT64 packages #178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3f64c9a
build-and-deploy: prepare for UCRT64 packages
rimrul May 30, 2026
00d8c4d
build-and-deploy: support UCRT64 via the pseudo architecture `ucrt64`
dscho Jun 13, 2026
02a05df
ensure-not-yet-deployed: support the `ucrt64` pseudo architecture
dscho Jun 13, 2026
73a7953
Merge branch 'rimrul/prepare-for-ucrt64'
dscho Jun 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions .github/workflows/build-and-deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ on:
description: 'The ref containing the package definition'
required: true
architecture:
description: 'The architecture to build for (only for MSYS packages and all arm64 builds)'
description: 'The architecture to build for (only for MSYS packages, ucrt64 builds, and all arm64 builds)'
required: false
actor:
description: The GitHub user on whose behalf this workflow is run
Expand Down Expand Up @@ -232,6 +232,10 @@ jobs:
GIT_EXE="/mingw32/bin/git.exe"
BUILD_SRC=
;;
ucrt64)
GIT_EXE="/ucrt64/bin/git.exe"
BUILD_SRC=
;;
*)
GIT_EXE="/mingw64/bin/git.exe"
BUILD_SRC="YesPlease"
Expand All @@ -251,10 +255,11 @@ jobs:
aarch64,*) echo "clangarm64";;
x86_64,*) echo "mingw64";;
i686,*) echo "mingw32";;
,mingw-w64-wintoast) echo "mingw32 mingw64 clangarm64";; # We're (cross-)compiling via Visual Studio
,mingw-w64-git-credential-manager) echo "mingw32 mingw64 clangarm64";; # We're downloading the pre-built artifacts for all three platforms
,mingw-w64-git-lfs) echo "mingw32 mingw64 clangarm64";; # We're downloading the pre-built artifacts from Git LFS' official release page
,*) echo "mingw32 mingw64";;
ucrt64,*) echo "ucrt64";;
,mingw-w64-wintoast) echo "mingw32 mingw64 ucrt64 clangarm64";; # We're (cross-)compiling via Visual Studio
,mingw-w64-git-credential-manager) echo "mingw32 mingw64 ucrt64 clangarm64";; # We're downloading the pre-built artifacts for all three platforms
,mingw-w64-git-lfs) echo "mingw32 mingw64 ucrt64 clangarm64";; # We're downloading the pre-built artifacts from Git LFS' official release page
,*) echo "mingw32 mingw64 ucrt64";;
esac
)

Expand Down
23 changes: 16 additions & 7 deletions update-scripts/ensure-not-yet-deployed.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,11 @@ architecture=
while case "$1" in
--architecture=*)
architecture=${1#*=}
if test aarch64 = "$architecture"
then
MINGW_PACKAGE_PREFIX=mingw-w64-clang-aarch64
else
MINGW_PACKAGE_PREFIX=mingw-w64-$architecture
fi
case "$architecture" in
aarch64) MINGW_PACKAGE_PREFIX=mingw-w64-clang-aarch64;;
ucrt64) MINGW_PACKAGE_PREFIX=mingw-w64-ucrt-x86_64;;
*) MINGW_PACKAGE_PREFIX=mingw-w64-$architecture;;
esac
;;
-*) die "Unhandled option: '$1'";;
*) break;
Expand All @@ -27,6 +26,16 @@ die "Usage: $0 <directory-containing-PKGBUILD>"
cd "$1" ||
die "Could not switch to '$1'"

# Some PKGBUILDs use $CARCH at top level (outside functions). Set it before
# sourcing so that architecture-dependent logic (case statements, variable
# assignments) works correctly even though we are not running under makepkg.
case "$architecture" in
aarch64) CARCH=aarch64;;
i686) CARCH=i686;;
*) CARCH=x86_64;;
esac &&
export CARCH &&

. ./PKGBUILD ||
die "No/invalid PKGBUILD in '$1'?"

Expand Down Expand Up @@ -58,7 +67,7 @@ esac &&

subdir="${architecture:-$arch}" &&
case "$subdir" in
any) subdir=x86_64;;
any|ucrt64) subdir=x86_64;;
esac &&

case "$pkgname" in
Expand Down