From 07a2102d49839f290c264314635a0bca428a4343 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Mon, 14 Jul 2025 23:53:03 +0200 Subject: [PATCH 1/3] CI: do show the `releasable` list that is actually used In 53038d47a (ci: avoid building the installer multiple times, 2023-08-28), I added code to limit where the `installer` artifact is built, but forgot to do that _before_ the `releaseable.txt` file is shown. Signed-off-by: Johannes Schindelin --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2a54cf5956..11caa6c3c1 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -54,12 +54,12 @@ jobs: echo "test-sdk-artifacts=true" >>$GITHUB_OUTPUT git ls-files \*/release.sh | sed 's|[^/]*$||' | sort >releaseable.txt && - show_files releaseable.txt && if grep -q test-sdk-artifacts=true $GITHUB_OUTPUT then # These are already tested as part of the `sdk-artifacts` matrix sed -i '/^\(installer\|mingit\)\/$/d' releaseable.txt fi && + show_files releaseable.txt && define_matrix artifacts releaseable.txt touched.txt artifacts.txt && show_files artifacts.txt || exit $? From 7ac5ddc5abf9816ac6f0e3a5caaabb429fe7347d Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Mon, 14 Jul 2025 23:56:24 +0200 Subject: [PATCH 2/3] CI: do test `mingit` when appropriate In 53038d47a (ci: avoid building the installer multiple times, 2023-08-28), I claimed that the MinGit artifact is already built in the `sdk-artifacts` matrix. That is only _kind_ of true: As part of building the `build-installers` SDK artifact, there _is_ a part where the a minimal SDK is built, but not MinGit. Let's build MinGit again when code was touched that changes how it is built. Signed-off-by: Johannes Schindelin --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 11caa6c3c1..f0b727aa66 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -56,8 +56,8 @@ jobs: git ls-files \*/release.sh | sed 's|[^/]*$||' | sort >releaseable.txt && if grep -q test-sdk-artifacts=true $GITHUB_OUTPUT then - # These are already tested as part of the `sdk-artifacts` matrix - sed -i '/^\(installer\|mingit\)\/$/d' releaseable.txt + # This is already tested as part of the `sdk-artifacts` matrix + sed -i '/^\(installer\)\/$/d' releaseable.txt fi && show_files releaseable.txt && define_matrix artifacts releaseable.txt touched.txt artifacts.txt && From 682dfd711936abd61fdd411f66d96b5467da98c8 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Mon, 14 Jul 2025 22:43:57 +0200 Subject: [PATCH 3/3] mingit: exclude the tzdata Since https://github.com/msys2/MINGW-packages/pull/24750, the `mingw-w64-gcc-libs` package now has a hard dependency on `mingw-w64-tzdata`. That latter package contains, let's say, _many_ files. As a consequence, the `7z` invocation to build MinGit would now fail like this: Creating .zip archive + cd / + 7z a -mx9 [...] release.sh: line 176: /mingw64/bin/7z: Argument list too long Error: Process completed with exit code 126. Since the new code that makes use of that tzdata explicitly comes with a fall-back to an internal database, let's just skip the tzdata when building MinGit. Signed-off-by: Johannes Schindelin --- make-file-list.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/make-file-list.sh b/make-file-list.sh index 8741443357..c1d94944b9 100755 --- a/make-file-list.sh +++ b/make-file-list.sh @@ -50,7 +50,7 @@ then PACKAGE_EXCLUDES="$PACKAGE_EXCLUDES mingw-w64-bzip2 mingw-w64-c-ares mingw-w64-libsystre mingw-w64-libtre-git mingw-w64-p11-kit mingw-w64-tcl mingw-w64-tk mingw-w64-wineditline gdbm icu libdb - libedit libgdbm perl perl-.*" + libedit libgdbm perl perl-.* mingw-w64-tzdata" fi if test -z "$INCLUDE_GIT_UPDATE" then