Skip to content

Commit 6c2ab4d

Browse files
Vollstreckermadler
authored andcommitted
CMake: Do not test with bzip2 on Windows or Cygwin.
1 parent 05051d2 commit 6c2ab4d

File tree

2 files changed

+12
-5
lines changed

2 files changed

+12
-5
lines changed

.github/workflows/cmake.yml

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,25 +13,29 @@ jobs:
1313
compiler: gcc
1414
cflags: -Wall -Wextra
1515
pkgtgt: package package_source
16+
cmake-args: -DMINIZIP_ENABLE_BZIP2=ON
1617

1718
- name: Ubuntu GCC -O3
1819
os: ubuntu-latest
1920
compiler: gcc
2021
cflags: -O3 -Wall -Wextra
2122
pkgtgt: package package_source
23+
cmake-args: -DMINIZIP_ENABLE_BZIP2=ON
2224

2325
- name: Ubuntu Clang
2426
os: ubuntu-latest
2527
compiler: clang
2628
cflags: -Wall -Wextra
2729
pkgtgt: package package_source
30+
cmake-args: -DMINIZIP_ENABLE_BZIP2=ON
2831

2932
- name: Ubuntu Clang Debug
3033
os: ubuntu-latest
3134
compiler: clang
3235
cflags: -Wall -Wextra
3336
build-config: Debug
3437
pkgtgt: package package_source
38+
cmake-args: -DMINIZIP_ENABLE_BZIP2=ON
3539

3640
- name: Windows MSVC Win32
3741
os: windows-latest
@@ -46,25 +50,29 @@ jobs:
4650
cflags: /W3
4751
cmake-args: -A x64
4852
pkgtgt: PACKAGE
53+
cmake-args: -DMINIZIP_ENABLE_BZIP2=OFF
4954

5055
- name: Windows GCC
5156
os: windows-latest
5257
compiler: gcc
5358
cflags: -Wall -Wextra
5459
cmake-args: -G Ninja
5560
pkgtgt: package
61+
cmake-args: -DMINIZIP_ENABLE_BZIP2=OFF
5662

5763
- name: macOS Clang
5864
os: macos-latest
5965
compiler: clang
6066
cflags: -Wall -Wextra
6167
pkgtgt: package
68+
cmake-args: -DMINIZIP_ENABLE_BZIP2=ON
6269

6370
- name: macOS GCC
6471
os: macos-latest
6572
compiler: gcc-12
6673
cflags: -Wall -Wextra
6774
pkgtgt: package
75+
cmake-args: -DMINIZIP_ENABLE_BZIP2=ON
6876

6977
steps:
7078
- name: Checkout repository
@@ -73,14 +81,14 @@ jobs:
7381
- name: Install packages (Windows)
7482
if: runner.os == 'Windows'
7583
run: |
76-
choco install --no-progress ninja bzip2
84+
choco install --no-progress ninja
7785
7886
- name: Install packages (Linux)
7987
if: runner.os == 'Linux'
8088
run: |
81-
apt install libbz2-dev
89+
sudo apt install libbz2-dev
8290
- name: Generate project files
83-
run: cmake -S . -B ../build ${{ matrix.cmake-args }} -D CMAKE_BUILD_TYPE=${{ matrix.build-config || 'Release' }} -DZLIB_BUILD_MINIZIP=ON -DMINIZIP_ENABLE_BZIP2=ON
91+
run: cmake -S . -B ../build ${{ matrix.cmake-args }} -D CMAKE_BUILD_TYPE=${{ matrix.build-config || 'Release' }} -DZLIB_BUILD_MINIZIP=ON
8492
env:
8593
CC: ${{ matrix.compiler }}
8694
CFLAGS: ${{ matrix.cflags }}

.github/workflows/msys-cygwin.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ jobs:
5858
uses: cygwin/cygwin-install-action@master
5959
with:
6060
packages: >-
61-
bzip2
6261
cmake
6362
cygwin-devel
6463
gcc-core
@@ -70,7 +69,7 @@ jobs:
7069
-B build \
7170
-DCMAKE_BUILD_TYPE=Release \
7271
-DZLIB_BUILD_MINIZIP=ON \
73-
-DMINIZIP_ENABLE_BZIP2=ON \
72+
-DMINIZIP_ENABLE_BZIP2=OFF
7473
-G Ninja
7574
- name: Build
7675
run: cmake --build build --config Release -v -j1

0 commit comments

Comments
 (0)