aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVollstrecker <werner@vollstreckernet.de>2024-12-27 10:58:44 +0100
committerMark Adler <madler@alumni.caltech.edu>2025-01-31 20:01:41 -0800
commitd82da0fd1586f6df3fa1c5751f627a12bda8d2fe (patch)
tree681678d9cf6026e03cadf688032839e49eed7308
parent373bc1d7c564fdff67847d215eb0b6a5896c23a2 (diff)
downloadzlib-d82da0fd1586f6df3fa1c5751f627a12bda8d2fe.tar.gz
zlib-d82da0fd1586f6df3fa1c5751f627a12bda8d2fe.tar.bz2
zlib-d82da0fd1586f6df3fa1c5751f627a12bda8d2fe.zip
CMake: Remove cmake out-of-tree test.
CMake is designed for that.
-rw-r--r--.github/workflows/cmake.yml22
1 files changed, 6 insertions, 16 deletions
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
index 3ee9318..40aae60 100644
--- a/.github/workflows/cmake.yml
+++ b/.github/workflows/cmake.yml
@@ -14,15 +14,6 @@ jobs:
14 cflags: -Wall -Wextra 14 cflags: -Wall -Wextra
15 pkgtgt: package package_source 15 pkgtgt: package package_source
16 16
17 # Test out of source builds
18 - name: Ubuntu GCC OSB
19 os: ubuntu-latest
20 compiler: gcc
21 cflags: -Wall -Wextra
22 build-dir: ../build
23 src-dir: ../zlib
24 pkgtgt: package package_source
25
26 - name: Ubuntu GCC -O3 17 - name: Ubuntu GCC -O3
27 os: ubuntu-latest 18 os: ubuntu-latest
28 compiler: gcc 19 compiler: gcc
@@ -85,21 +76,20 @@ jobs:
85 choco install --no-progress ninja ${{ matrix.packages }} 76 choco install --no-progress ninja ${{ matrix.packages }}
86 77
87 - name: Generate project files 78 - name: Generate project files
88 run: cmake -S ${{ matrix.src-dir || '.' }} -B ${{ matrix.build-dir || '.' }} ${{ matrix.cmake-args }} -D CMAKE_BUILD_TYPE=${{ matrix.build-config || 'Release' }} -DZLIB_BUILD_MINIZIP=ON 79 run: cmake -S . -B ../build ${{ matrix.cmake-args }} -D CMAKE_BUILD_TYPE=${{ matrix.build-config || 'Release' }} -DZLIB_BUILD_MINIZIP=ON
89 env: 80 env:
90 CC: ${{ matrix.compiler }} 81 CC: ${{ matrix.compiler }}
91 CFLAGS: ${{ matrix.cflags }} 82 CFLAGS: ${{ matrix.cflags }}
92 83
93 - name: Compile source code 84 - name: Compile source code
94 run: cmake --build ${{ matrix.build-dir || '.' }} --config ${{ matrix.build-config || 'Release' }} 85 run: cmake --build ../build --config ${{ matrix.build-config || 'Release' }}
95 86
96 - name: Run test cases 87 - name: Run test cases
97 run: ctest -C Release --output-on-failure --max-width 120 88 run: ctest -C Release --output-on-failure --max-width 120
98 working-directory: ${{ matrix.build-dir || '.' }} 89 working-directory: ../build
99 90
100 - name: create packages 91 - name: create packages
101 run: cmake --build ${{ matrix.build-dir || '.' }} --config ${{ matrix.build-config || 'Release' }} -t ${{ matrix.pkgtgt }} 92 run: cmake --build ../build --config ${{ matrix.build-config || 'Release' }} -t ${{ matrix.pkgtgt }}
102 working-directory: ${{ matrix.build-dir || '.' }}
103 93
104 - name: Upload build errors 94 - name: Upload build errors
105 uses: actions/upload-artifact@v4 95 uses: actions/upload-artifact@v4
@@ -107,6 +97,6 @@ jobs:
107 with: 97 with:
108 name: ${{ matrix.name }} (cmake) 98 name: ${{ matrix.name }} (cmake)
109 path: | 99 path: |
110 **/CMakeFiles/CMakeOutput.log 100 ../build/CMakeFiles/CMakeOutput.log
111 **/CMakeFiles/CMakeError.log 101 ../build/CMakeFiles/CMakeError.log
112 retention-days: 7 102 retention-days: 7