From a5bb431d47090e0faa3363ad33495157ec09d15a Mon Sep 17 00:00:00 2001 From: ISSOtm Date: Mon, 16 Mar 2026 11:39:51 +0100 Subject: [PATCH] Fix debug-mode building on Windows ASan seems broken, and the debug-mode DLL names are different --- .github/workflows/testing.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 38a10939..b11fa1f6 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -159,11 +159,11 @@ jobs: if: steps.cache.outputs.cache-hit != 'true' shell: bash run: | # BUILD_SHARED_LIBS causes the output DLL to be called `z.dll` as of zlib 1.3.2 (formerly `zlib1.dll`) - cmake -S zlib -B zbuild -A ${{ matrix.platform }} -Wno-dev -DCMAKE_INSTALL_PREFIX=install_dir -DCMAKE_BUILD_TYPE=Debug -DBUILD_SHARED_LIBS=ON + cmake -S zlib -B zbuild -A ${{ matrix.platform }} -Wno-dev -DCMAKE_INSTALL_PREFIX=install_dir -DBUILD_SHARED_LIBS=ON cmake --build zbuild --config Debug -j - name: Install zlib run: | - cmake --install zbuild + cmake --install zbuild --config Debug - name: Build libpng if: steps.cache.outputs.cache-hit != 'true' shell: bash @@ -172,18 +172,18 @@ jobs: cmake --build pngbuild --config Debug -j - name: Install libpng run: | - cmake --install pngbuild + cmake --install pngbuild --config Debug - name: Build Windows binaries shell: bash - run: | - cmake -S . -B build -A ${{ matrix.platform }} --preset develop -DCMAKE_INSTALL_PREFIX=install_dir + run: | # ASan seems to be broken on Windows. + cmake -S . -B build -A ${{ matrix.platform }} --preset develop -DCMAKE_INSTALL_PREFIX=install_dir -DSANITIZERS=OFF cmake --build build --config Debug -j --verbose - cmake --install build --verbose --prefix install_dir + cmake --install build --verbose - name: Package binaries shell: bash run: | mkdir bins - cp install_dir/bin/{rgbasm.exe,rgblink.exe,rgbfix.exe,rgbgfx.exe,z.dll,libpng16.dll} bins + cp -v install_dir/bin/{rgb*.exe,*.dll} bins - name: Upload Windows binaries uses: actions/upload-artifact@v4 with: