Skip to content

Commit 1e983e5

Browse files
committed
ci-artifacts: build git-for-windows/git, not git/git, for the UCRT64 SDK
Cloning git/git's `master` no longer compiles against this branch's SDK: with `MSYSTEM=UCRT64`, `config.mak.uname` upstream falls into the catch-all `else` of its MSYSTEM ladder (MINGW32 / MINGW64 / CLANGARM64) and appends `-D_USE_32BIT_TIME_T` to `COMPAT_CFLAGS`, which UCRT then rejects with `#error You cannot use 32-bit time_t (_USE_32BIT_TIME_T) with _WIN64`. The git-for-windows fork rewrote that block to derive `MINGW_PREFIX` and `HOST_CPU` from the MSYS2-provided variables, so UCRT64 just works, the same way it does for the `mingw-w64-git` PKGBUILD that sources from this fork. Switching the ci-artifacts smoke build to the fork's `main` is also a closer match to what we actually ship. Assisted-by: Opus 4.7 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
1 parent 90e26fa commit 1e983e5

1 file changed

Lines changed: 6 additions & 3 deletions

File tree

.github/workflows/ci-artifacts.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,12 @@ jobs:
4444
with:
4545
name: minimal-sdk
4646
path: git-sdk-x86_64-minimal.tar.gz
47-
- name: clone git.git's `master`
48-
run: git clone --depth=1 --branch master https://github.com/git/git ..\git
49-
- name: build current `master` of git.git
47+
- name: clone git-for-windows/git's `main`
48+
shell: bash
49+
run: |
50+
git clone --depth=1 --branch main \
51+
https://github.com/git-for-windows/git ..\git
52+
- name: build current `main` of git-for-windows/git
5053
shell: bash
5154
run: |
5255
set -x

0 commit comments

Comments
 (0)