diff options
Diffstat (limited to '.github')
-rw-r--r-- | .github/workflows/cmake.yml | 14 | ||||
-rw-r--r-- | .github/workflows/msys-cygwin.yml | 3 |
2 files changed, 12 insertions, 5 deletions
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index f0f293a..a25a387 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml | |||
@@ -13,18 +13,21 @@ jobs: | |||
13 | compiler: gcc | 13 | compiler: gcc |
14 | cflags: -Wall -Wextra | 14 | cflags: -Wall -Wextra |
15 | pkgtgt: package package_source | 15 | pkgtgt: package package_source |
16 | cmake-args: -DMINIZIP_ENABLE_BZIP2=ON | ||
16 | 17 | ||
17 | - name: Ubuntu GCC -O3 | 18 | - name: Ubuntu GCC -O3 |
18 | os: ubuntu-latest | 19 | os: ubuntu-latest |
19 | compiler: gcc | 20 | compiler: gcc |
20 | cflags: -O3 -Wall -Wextra | 21 | cflags: -O3 -Wall -Wextra |
21 | pkgtgt: package package_source | 22 | pkgtgt: package package_source |
23 | cmake-args: -DMINIZIP_ENABLE_BZIP2=ON | ||
22 | 24 | ||
23 | - name: Ubuntu Clang | 25 | - name: Ubuntu Clang |
24 | os: ubuntu-latest | 26 | os: ubuntu-latest |
25 | compiler: clang | 27 | compiler: clang |
26 | cflags: -Wall -Wextra | 28 | cflags: -Wall -Wextra |
27 | pkgtgt: package package_source | 29 | pkgtgt: package package_source |
30 | cmake-args: -DMINIZIP_ENABLE_BZIP2=ON | ||
28 | 31 | ||
29 | - name: Ubuntu Clang Debug | 32 | - name: Ubuntu Clang Debug |
30 | os: ubuntu-latest | 33 | os: ubuntu-latest |
@@ -32,6 +35,7 @@ jobs: | |||
32 | cflags: -Wall -Wextra | 35 | cflags: -Wall -Wextra |
33 | build-config: Debug | 36 | build-config: Debug |
34 | pkgtgt: package package_source | 37 | pkgtgt: package package_source |
38 | cmake-args: -DMINIZIP_ENABLE_BZIP2=ON | ||
35 | 39 | ||
36 | - name: Windows MSVC Win32 | 40 | - name: Windows MSVC Win32 |
37 | os: windows-latest | 41 | os: windows-latest |
@@ -46,6 +50,7 @@ jobs: | |||
46 | cflags: /W3 | 50 | cflags: /W3 |
47 | cmake-args: -A x64 | 51 | cmake-args: -A x64 |
48 | pkgtgt: PACKAGE | 52 | pkgtgt: PACKAGE |
53 | cmake-args: -DMINIZIP_ENABLE_BZIP2=OFF | ||
49 | 54 | ||
50 | - name: Windows GCC | 55 | - name: Windows GCC |
51 | os: windows-latest | 56 | os: windows-latest |
@@ -53,18 +58,21 @@ jobs: | |||
53 | cflags: -Wall -Wextra | 58 | cflags: -Wall -Wextra |
54 | cmake-args: -G Ninja | 59 | cmake-args: -G Ninja |
55 | pkgtgt: package | 60 | pkgtgt: package |
61 | cmake-args: -DMINIZIP_ENABLE_BZIP2=OFF | ||
56 | 62 | ||
57 | - name: macOS Clang | 63 | - name: macOS Clang |
58 | os: macos-latest | 64 | os: macos-latest |
59 | compiler: clang | 65 | compiler: clang |
60 | cflags: -Wall -Wextra | 66 | cflags: -Wall -Wextra |
61 | pkgtgt: package | 67 | pkgtgt: package |
68 | cmake-args: -DMINIZIP_ENABLE_BZIP2=ON | ||
62 | 69 | ||
63 | - name: macOS GCC | 70 | - name: macOS GCC |
64 | os: macos-latest | 71 | os: macos-latest |
65 | compiler: gcc-12 | 72 | compiler: gcc-12 |
66 | cflags: -Wall -Wextra | 73 | cflags: -Wall -Wextra |
67 | pkgtgt: package | 74 | pkgtgt: package |
75 | cmake-args: -DMINIZIP_ENABLE_BZIP2=ON | ||
68 | 76 | ||
69 | steps: | 77 | steps: |
70 | - name: Checkout repository | 78 | - name: Checkout repository |
@@ -73,14 +81,14 @@ jobs: | |||
73 | - name: Install packages (Windows) | 81 | - name: Install packages (Windows) |
74 | if: runner.os == 'Windows' | 82 | if: runner.os == 'Windows' |
75 | run: | | 83 | run: | |
76 | choco install --no-progress ninja bzip2 | 84 | choco install --no-progress ninja |
77 | 85 | ||
78 | - name: Install packages (Linux) | 86 | - name: Install packages (Linux) |
79 | if: runner.os == 'Linux' | 87 | if: runner.os == 'Linux' |
80 | run: | | 88 | run: | |
81 | apt install libbz2-dev | 89 | sudo apt install libbz2-dev |
82 | - name: Generate project files | 90 | - 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 |
84 | env: | 92 | env: |
85 | CC: ${{ matrix.compiler }} | 93 | CC: ${{ matrix.compiler }} |
86 | CFLAGS: ${{ matrix.cflags }} | 94 | CFLAGS: ${{ matrix.cflags }} |
diff --git a/.github/workflows/msys-cygwin.yml b/.github/workflows/msys-cygwin.yml index e325516..ef2593f 100644 --- a/.github/workflows/msys-cygwin.yml +++ b/.github/workflows/msys-cygwin.yml | |||
@@ -58,7 +58,6 @@ jobs: | |||
58 | uses: cygwin/cygwin-install-action@master | 58 | uses: cygwin/cygwin-install-action@master |
59 | with: | 59 | with: |
60 | packages: >- | 60 | packages: >- |
61 | bzip2 | ||
62 | cmake | 61 | cmake |
63 | cygwin-devel | 62 | cygwin-devel |
64 | gcc-core | 63 | gcc-core |
@@ -70,7 +69,7 @@ jobs: | |||
70 | -B build \ | 69 | -B build \ |
71 | -DCMAKE_BUILD_TYPE=Release \ | 70 | -DCMAKE_BUILD_TYPE=Release \ |
72 | -DZLIB_BUILD_MINIZIP=ON \ | 71 | -DZLIB_BUILD_MINIZIP=ON \ |
73 | -DMINIZIP_ENABLE_BZIP2=ON \ | 72 | -DMINIZIP_ENABLE_BZIP2=OFF |
74 | -G Ninja | 73 | -G Ninja |
75 | - name: Build | 74 | - name: Build |
76 | run: cmake --build build --config Release -v -j1 | 75 | run: cmake --build build --config Release -v -j1 |