From ff92e0412a78a0f5caa25a48f67f470031d0d3e9 Mon Sep 17 00:00:00 2001 From: Vollstrecker Date: Tue, 31 Dec 2024 14:18:49 +0100 Subject: [PATCH] disable bzip2 for tests as it's not everywhere installed --- .github/workflows/c-std.yml | 4 ++-- .github/workflows/cmake.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/c-std.yml b/.github/workflows/c-std.yml index bc9311045..2d1acb72d 100644 --- a/.github/workflows/c-std.yml +++ b/.github/workflows/c-std.yml @@ -133,7 +133,7 @@ jobs: - name: Generate project files (cmake) if: matrix.builder == 'cmake' run: | - cmake -S . -B ./build1 -D CMAKE_BUILD_TYPE=Release ${{ matrix.os.cmake-opt }} -DZLIB_BUILD_TESTING=OFF + cmake -S . -B ./build1 -D CMAKE_BUILD_TYPE=Release ${{ matrix.os.cmake-opt }} -DZLIB_BUILD_TESTING=OFF -DMINIZIP_ENABLE_BZIP2=OFF env: CC: ${{ matrix.compiler }} CFLAGS: -std=${{ matrix.std.value }} ${{ matrix.arch.compiler-opt }} -Werror -Wall -Wextra @@ -141,7 +141,7 @@ jobs: - name: Generate project files with tests (cmake) if: matrix.builder == 'cmake' run: | - cmake -S . -B ./build2 -D CMAKE_BUILD_TYPE=Release ${{ matrix.os.cmake-opt }} -DZLIB_BUILD_MINIZIP=ON + cmake -S . -B ./build2 -D CMAKE_BUILD_TYPE=Release ${{ matrix.os.cmake-opt }} -DZLIB_BUILD_MINIZIP=ON -DMINIZIP_ENABLE_BZIP2=OFF env: CC: ${{ matrix.compiler }} CFLAGS: -std=${{ matrix.std.value }} ${{ matrix.arch.compiler-opt }} -Wall -Wextra diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 40aae6083..714d4bfe3 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 + run: cmake -S . -B ../build ${{ matrix.cmake-args }} -D CMAKE_BUILD_TYPE=${{ matrix.build-config || 'Release' }} -DZLIB_BUILD_MINIZIP=ON -DMINIZIP_ENBALE_BZIP2=OFF env: CC: ${{ matrix.compiler }} CFLAGS: ${{ matrix.cflags }}