Skip to content

Commit

Permalink
fixup! ci: Test CMake edge cases
Browse files Browse the repository at this point in the history
CMake 3.21:
- cmake gained the --toolchain command-line option to specify a
toolchain file.
  • Loading branch information
hebasto committed Mar 19, 2024
1 parent d267c2c commit a6a746e
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/cmake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -170,17 +170,17 @@ jobs:
- name: Generate build system. Expected to FAIL
if: ${{ matrix.conf.expected == 'fail' }}
run: |
! cmake -B build -DCMAKE_TOOLCHAIN_FILE=depends/x86_64-pc-linux-gnu/share/toolchain.cmake ${{ matrix.conf.build_options }}
! cmake -B build --toolchain depends/x86_64-pc-linux-gnu/share/toolchain.cmake ${{ matrix.conf.build_options }}
- name: Generate build system. Expected to PASS
if: ${{ matrix.conf.expected == 'pass' }}
run: |
cmake -B build -DCMAKE_TOOLCHAIN_FILE=depends/x86_64-pc-linux-gnu/share/toolchain.cmake
cmake -B build --toolchain depends/x86_64-pc-linux-gnu/share/toolchain.cmake
ubuntu-focal-native:
name: 'Ubuntu 20.04, CMake 3.16, Boost ${{ matrix.conf.boost_version }}'
runs-on: ubuntu-20.04
ubuntu-jammy-native:
name: 'Ubuntu 22.04, CMake 3.22, Boost ${{ matrix.conf.boost_version }}'
runs-on: ubuntu-22.04

strategy:
fail-fast: false
Expand All @@ -204,7 +204,7 @@ jobs:
- name: Install packages
run: |
sudo apt-get update
sudo apt-get install --no-install-recommends curl g++10 cmake ccache libevent-dev libsqlite3-dev libdb-dev libdb++-dev libminiupnpc-dev libnatpmp-dev libzmq3-dev systemtap-sdt-dev
sudo apt-get install --no-install-recommends curl cmake ccache libevent-dev libsqlite3-dev libdb-dev libdb++-dev libminiupnpc-dev libnatpmp-dev libzmq3-dev systemtap-sdt-dev
echo "CCACHE_DIR=${{ runner.temp }}/ccache" >> "$GITHUB_ENV"
- name: CMake version
Expand Down

0 comments on commit a6a746e

Please sign in to comment.