no test for bzip2 on win and cygwin

madler · Jan 22, 2025 · 755c359 · 755c359
1 parent f8eefc6
commit 755c359
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
@@ -13,25 +13,29 @@ jobs:
             compiler: gcc
             cflags: -Wall -Wextra
             pkgtgt: package package_source
+            cmake-args: -DMINIZIP_ENABLE_BZIP2=ON
 
           - name: Ubuntu GCC -O3
             os: ubuntu-latest
             compiler: gcc
             cflags: -O3 -Wall -Wextra
             pkgtgt: package package_source
+            cmake-args: -DMINIZIP_ENABLE_BZIP2=ON
 
           - name: Ubuntu Clang
             os: ubuntu-latest
             compiler: clang
             cflags: -Wall -Wextra
             pkgtgt: package package_source
+            cmake-args: -DMINIZIP_ENABLE_BZIP2=ON
 
           - name: Ubuntu Clang Debug
             os: ubuntu-latest
             compiler: clang
             cflags: -Wall -Wextra
             build-config: Debug
             pkgtgt: package package_source
+            cmake-args: -DMINIZIP_ENABLE_BZIP2=ON
 
           - name: Windows MSVC Win32
             os: windows-latest
@@ -59,12 +63,14 @@ jobs:
             compiler: clang
             cflags: -Wall -Wextra
             pkgtgt: package
+            cmake-args: -DMINIZIP_ENABLE_BZIP2=ON
 
           - name: macOS GCC
             os: macos-latest
             compiler: gcc-12
             cflags: -Wall -Wextra
             pkgtgt: package
+            cmake-args: -DMINIZIP_ENABLE_BZIP2=ON
 
     steps:
     - name: Checkout repository
@@ -73,14 +79,14 @@ jobs:
     - name: Install packages (Windows)
       if: runner.os == 'Windows'
       run: |
-        choco install --no-progress ninja bzip2
+        choco install --no-progress ninja
 
     - name: Install packages (Linux)
       if: runner.os == 'Linux'
       run: |
-        apt install libbz2-dev
+        sudo apt install libbz2-dev
     - 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=ON
+      run: cmake -S . -B ../build ${{ matrix.cmake-args }} -D CMAKE_BUILD_TYPE=${{ matrix.build-config || 'Release' }} -DZLIB_BUILD_MINIZIP=ON
       env:
         CC: ${{ matrix.compiler }}
         CFLAGS: ${{ matrix.cflags }}

diff --git a/.github/workflows/msys-cygwin.yml b/.github/workflows/msys-cygwin.yml
@@ -58,7 +58,6 @@ jobs:
       uses: cygwin/cygwin-install-action@master
       with:
         packages: >-
-          bzip2
           cmake
           cygwin-devel
           gcc-core
@@ -70,7 +69,6 @@ jobs:
           -B build \
           -DCMAKE_BUILD_TYPE=Release \
           -DZLIB_BUILD_MINIZIP=ON \
-          -DMINIZIP_ENABLE_BZIP2=ON \
           -G Ninja
     - name: Build
       run: cmake --build build --config Release -v -j1