diff options
| -rw-r--r-- | .github/workflows/cmake.yml | 13 | ||||
| -rw-r--r-- | .github/workflows/configure.yml | 13 |
2 files changed, 14 insertions, 12 deletions
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index ed3a79b..5113952 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml | |||
| @@ -12,11 +12,12 @@ jobs: | |||
| 12 | os: ubuntu-latest | 12 | os: ubuntu-latest |
| 13 | compiler: gcc | 13 | compiler: gcc |
| 14 | 14 | ||
| 15 | - name: Ubuntu GCC ISB | 15 | # Test out of source builds |
| 16 | - name: Ubuntu GCC OSB | ||
| 16 | os: ubuntu-latest | 17 | os: ubuntu-latest |
| 17 | compiler: gcc | 18 | compiler: gcc |
| 18 | build-dir: "." | 19 | build-dir: ../build |
| 19 | src-dir: "." | 20 | src-dir: ../zlib |
| 20 | 21 | ||
| 21 | - name: Ubuntu Clang | 22 | - name: Ubuntu Clang |
| 22 | os: ubuntu-latest | 23 | os: ubuntu-latest |
| @@ -50,13 +51,13 @@ jobs: | |||
| 50 | uses: actions/checkout@v3 | 51 | uses: actions/checkout@v3 |
| 51 | 52 | ||
| 52 | - name: Generate project files | 53 | - name: Generate project files |
| 53 | run: cmake -S ${{ matrix.src-dir || '../zlib' }} -B ${{ matrix.build-dir || '../build' }} ${{ matrix.cmake-args }} -D CMAKE_BUILD_TYPE=${{ matrix.build-config || 'Release' }} | 54 | run: cmake -S ${{ matrix.src-dir || '.' }} -B ${{ matrix.build-dir || '.' }} ${{ matrix.cmake-args }} -D CMAKE_BUILD_TYPE=${{ matrix.build-config || 'Release' }} |
| 54 | env: | 55 | env: |
| 55 | CC: ${{ matrix.compiler }} | 56 | CC: ${{ matrix.compiler }} |
| 56 | 57 | ||
| 57 | - name: Compile source code | 58 | - name: Compile source code |
| 58 | run: cmake --build ${{ matrix.build-dir || '../build' }} --config ${{ matrix.build-config || 'Release' }} | 59 | run: cmake --build ${{ matrix.build-dir || '.' }} --config ${{ matrix.build-config || 'Release' }} |
| 59 | 60 | ||
| 60 | - name: Run test cases | 61 | - name: Run test cases |
| 61 | run: ctest -C Release --output-on-failure --max-width 120 | 62 | run: ctest -C Release --output-on-failure --max-width 120 |
| 62 | working-directory: ${{ matrix.build-dir || '../build' }} | 63 | working-directory: ${{ matrix.build-dir || '.' }} |
diff --git a/.github/workflows/configure.yml b/.github/workflows/configure.yml index 2c19e60..09f67b4 100644 --- a/.github/workflows/configure.yml +++ b/.github/workflows/configure.yml | |||
| @@ -13,12 +13,13 @@ jobs: | |||
| 13 | compiler: gcc | 13 | compiler: gcc |
| 14 | configure-args: --warn | 14 | configure-args: --warn |
| 15 | 15 | ||
| 16 | - name: Ubuntu GCC ISB | 16 | # Test out of source builds |
| 17 | - name: Ubuntu GCC OSB | ||
| 17 | os: ubuntu-latest | 18 | os: ubuntu-latest |
| 18 | compiler: gcc | 19 | compiler: gcc |
| 19 | configure-args: --warn | 20 | configure-args: --warn |
| 20 | build-dir: "." | 21 | build-dir: ../build |
| 21 | src-dir: "." | 22 | src-dir: ../zlib |
| 22 | 23 | ||
| 23 | - name: macOS GCC | 24 | - name: macOS GCC |
| 24 | os: macos-latest | 25 | os: macos-latest |
| @@ -31,9 +32,9 @@ jobs: | |||
| 31 | 32 | ||
| 32 | - name: Generate project files | 33 | - name: Generate project files |
| 33 | run: | | 34 | run: | |
| 34 | [ -d ${{ matrix.build-dir || '../build' }} ] || mkdir ${{ matrix.build-dir || '../build' }} | 35 | [ -d ${{ matrix.build-dir || '.' }} ] || mkdir ${{ matrix.build-dir || '.' }} |
| 35 | cd ${{ matrix.build-dir || '../build' }} | 36 | cd ${{ matrix.build-dir || '.' }} |
| 36 | ${{ matrix.src-dir || '../zlib' }}/configure ${{ matrix.configure-args }} | 37 | ${{ matrix.src-dir || '.' }}/configure ${{ matrix.configure-args }} |
| 37 | env: | 38 | env: |
| 38 | CC: ${{ matrix.compiler }} | 39 | CC: ${{ matrix.compiler }} |
| 39 | 40 | ||
