Skip to content

Commit 4ea68d0

Browse files
committed
ci-artifacts: ask please.sh for the UCRT64 flavor explicitly
Now that build-extra has learned to accept `--architecture=ucrt64` in `create_sdk_artifact`, point both invocations at it. Without the flag, please.sh's auto-detect picks `x86_64`, hard-maps that to MINGW64 / /mingw64/, and writes a broken artifact (no /mingw64/bin exists on this branch, the Pacman package set carries the wrong prefix). This results in MSYSTEM=UCRT64 and PATH starting with /ucrt64/bin, as is needed for the artifact's own /etc/profile to be correct out of the box. For that reason, we now also verify that _that_ GCC is found ;-) Assisted-by: Opus 4.7 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
1 parent 038a353 commit 4ea68d0

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

.github/workflows/ci-artifacts.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
- name: build git-sdk-64-minimal-sdk
3535
shell: bash
3636
run: |
37-
sh -x ./build-extra/please.sh create-sdk-artifact --sdk=git-sdk-64.git minimal-sdk &&
37+
sh -x ./build-extra/please.sh create-sdk-artifact --architecture=ucrt64 --sdk=git-sdk-64.git minimal-sdk &&
3838
cygpath -aw minimal-sdk/usr/bin >>$GITHUB_PATH
3939
- name: compress artifact
4040
shell: bash
@@ -52,7 +52,7 @@ jobs:
5252
set -x
5353
. /etc/profile
5454
test "$(cygpath -aw /)" = "${{github.workspace}}\minimal-sdk" || exit 1
55-
test "$(type -p gcc)" = "/mingw64/bin/gcc" || exit 1
55+
test "$(type -p gcc)" = "/ucrt64/bin/gcc" || exit 1
5656
make -C ../git DEVELOPER=1 NO_PERL=1 NO_RUST=UnfortunatelyYes SKIP_DASHED_BUILT_INS=YesPlease -j8 all strip
5757
- name: compress git artifacts
5858
shell: bash
@@ -105,7 +105,7 @@ jobs:
105105
run: git clone --depth=1 --single-branch -b main https://github.com/git-for-windows/build-extra
106106
- name: build git-sdk-64-build-installers
107107
shell: bash
108-
run: sh -x ./build-extra/please.sh create-sdk-artifact --sdk=git-sdk-64.git build-installers
108+
run: sh -x ./build-extra/please.sh create-sdk-artifact --architecture=ucrt64 --sdk=git-sdk-64.git build-installers
109109
- name: compress artifact
110110
shell: bash
111111
run: |

.github/workflows/test-ci-artifacts.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ jobs:
8787
test "$(cygpath -aw /)" = "${{github.workspace}}\minimal-sdk" || exit 1
8888
8989
# comes with GCC and can compile a DLL
90-
test "$(type -p gcc)" = "/mingw64/bin/gcc" || exit 1
90+
test "$(type -p gcc)" = "/ucrt64/bin/gcc" || exit 1
9191
cat >dll.c <<-\EOF &&
9292
__attribute__((dllexport)) int increment(int i)
9393
{

0 commit comments

Comments
 (0)