From 03449d49ba812aac996dd4895d309cc204f9b704 Mon Sep 17 00:00:00 2001 From: Vollstrecker Date: Wed, 22 Jan 2025 17:27:16 +0100 Subject: CMake: Re-enable testing with bzip2. --- .github/workflows/cmake.yml | 2 +- .github/workflows/msys-cygwin.yml | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to '.github') diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 1b61711..51f8ba6 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -76,7 +76,7 @@ jobs: choco install --no-progress ninja ${{ matrix.packages }} - name: Generate project files - run: cmake -S . -B ../build ${{ matrix.cmake-args }} -D CMAKE_BUILD_TYPE=${{ matrix.build-config || 'Release' }} -DZLIB_BUILD_MINIZIP=ON -DMINIZIP_ENABLE_BZIP2=OFF + run: cmake -S . -B ../build ${{ matrix.cmake-args }} -D CMAKE_BUILD_TYPE=${{ matrix.build-config || 'Release' }} -DZLIB_BUILD_MINIZIP=ON -DMINIZIP_ENABLE_BZIP2=ON env: CC: ${{ matrix.compiler }} CFLAGS: ${{ matrix.cflags }} diff --git a/.github/workflows/msys-cygwin.yml b/.github/workflows/msys-cygwin.yml index 4f5018c..7e00c00 100644 --- a/.github/workflows/msys-cygwin.yml +++ b/.github/workflows/msys-cygwin.yml @@ -34,7 +34,8 @@ jobs: -S . \ -B build \ -DCMAKE_VERBOSE_MAKEFILE=ON \ - -DCMAKE_BUILD_TYPE=Release + -DCMAKE_BUILD_TYPE=Release \ + -DMINIZIP_ENABLE_BZIP2=ON - name: Build run: cmake --build build --config Release - name: Run tests @@ -65,7 +66,8 @@ jobs: run: | cmake /cygdrive/d/a/zlib/zlib \ -B build \ - -DCMAKE_BUILD_TYPE=Release + -DCMAKE_BUILD_TYPE=Release \ + -DMINIZIP_ENABLE_BZIP2=ON - name: Build run: cmake --build build --config Release - name: Run tests -- cgit v1.2.3-55-g6feb