From b7140bc683d215682b9a02c9da6b16e197062352 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 28 Dec 2024 19:42:20 +0100 Subject: [PATCH] Work on check-cygwin: Reenable the 32-bit Cygwin builds, with --disable-shared. --- .github/workflows/many-platforms.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.github/workflows/many-platforms.yml b/.github/workflows/many-platforms.yml index 4c76205..91f0623 100644 --- a/.github/workflows/many-platforms.yml +++ b/.github/workflows/many-platforms.yml @@ -1048,16 +1048,10 @@ jobs: fail-fast: false matrix: bitness: [32, 64] - # Disable the 32-bit build, because it has DLL address conflicts, - # leading to errors such as - # msgexec 11369 child_info_fork::abort: \??\C:\cygwin\bin\cygiconv-2.dll: Loaded to different address: parent(0xED0000) != child(0xEC0000) - # Cf. https://stackoverflow.com/questions/37602608/ # Disable the 64-bit build, due to too many regressions, see # https://lists.gnu.org/archive/html/bug-gnulib/2024-12/msg00169.html exclude: - - bitness: 32 - bitness: 64 - if: ${{ false }} runs-on: windows-2022 defaults: run: @@ -1106,7 +1100,7 @@ jobs: : "Set a PATH without native Windows implementations like java and tclsh." export PATH="/usr/bin:/cygdrive/c/Windows/system32:/cygdrive/c/Windows" export CPPFLAGS="-Wall" - ./build-on.sh '${{ env.package }}' '--enable-csharp=dotnet' 'make' '/usr' '' '' + ./build-on.sh '${{ env.package }}' '${{ matrix.bitness == 32 && '--disable-shared' || '' }} --enable-csharp=dotnet' 'make' '/usr' '' '' # Doc: https://docs.github.com/en/actions/using-workflows/storing-workflow-data-as-artifacts # https://github.com/actions/upload-artifact?tab=readme-ov-file#usage - if: ${{ always() }}