diff options
| author | Vollstrecker <werner@vollstreckernet.de> | 2025-01-22 17:27:16 +0100 |
|---|---|---|
| committer | Mark Adler <madler@alumni.caltech.edu> | 2025-01-31 20:02:26 -0800 |
| commit | 03449d49ba812aac996dd4895d309cc204f9b704 (patch) | |
| tree | d754a15829e82a5ea8861ad36f8d77c7235c95b7 | |
| parent | 6c224f159e6d940f775c017b1bc354d39d74ee48 (diff) | |
| download | zlib-03449d49ba812aac996dd4895d309cc204f9b704.tar.gz zlib-03449d49ba812aac996dd4895d309cc204f9b704.tar.bz2 zlib-03449d49ba812aac996dd4895d309cc204f9b704.zip | |
CMake: Re-enable testing with bzip2.
| -rw-r--r-- | .github/workflows/cmake.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/msys-cygwin.yml | 6 |
2 files changed, 5 insertions, 3 deletions
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: | |||
| 76 | choco install --no-progress ninja ${{ matrix.packages }} | 76 | choco install --no-progress ninja ${{ matrix.packages }} |
| 77 | 77 | ||
| 78 | - name: Generate project files | 78 | - name: Generate project files |
| 79 | run: cmake -S . -B ../build ${{ matrix.cmake-args }} -D CMAKE_BUILD_TYPE=${{ matrix.build-config || 'Release' }} -DZLIB_BUILD_MINIZIP=ON -DMINIZIP_ENABLE_BZIP2=OFF | 79 | run: cmake -S . -B ../build ${{ matrix.cmake-args }} -D CMAKE_BUILD_TYPE=${{ matrix.build-config || 'Release' }} -DZLIB_BUILD_MINIZIP=ON -DMINIZIP_ENABLE_BZIP2=ON |
| 80 | env: | 80 | env: |
| 81 | CC: ${{ matrix.compiler }} | 81 | CC: ${{ matrix.compiler }} |
| 82 | CFLAGS: ${{ matrix.cflags }} | 82 | 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: | |||
| 34 | -S . \ | 34 | -S . \ |
| 35 | -B build \ | 35 | -B build \ |
| 36 | -DCMAKE_VERBOSE_MAKEFILE=ON \ | 36 | -DCMAKE_VERBOSE_MAKEFILE=ON \ |
| 37 | -DCMAKE_BUILD_TYPE=Release | 37 | -DCMAKE_BUILD_TYPE=Release \ |
| 38 | -DMINIZIP_ENABLE_BZIP2=ON | ||
| 38 | - name: Build | 39 | - name: Build |
| 39 | run: cmake --build build --config Release | 40 | run: cmake --build build --config Release |
| 40 | - name: Run tests | 41 | - name: Run tests |
| @@ -65,7 +66,8 @@ jobs: | |||
| 65 | run: | | 66 | run: | |
| 66 | cmake /cygdrive/d/a/zlib/zlib \ | 67 | cmake /cygdrive/d/a/zlib/zlib \ |
| 67 | -B build \ | 68 | -B build \ |
| 68 | -DCMAKE_BUILD_TYPE=Release | 69 | -DCMAKE_BUILD_TYPE=Release \ |
| 70 | -DMINIZIP_ENABLE_BZIP2=ON | ||
| 69 | - name: Build | 71 | - name: Build |
| 70 | run: cmake --build build --config Release | 72 | run: cmake --build build --config Release |
| 71 | - name: Run tests | 73 | - name: Run tests |