Skip to content

Commit

Permalink
Merge #147: cmake, ci: Ensure minimum supported g++ version in CI jobs
Browse files Browse the repository at this point in the history
475cf6d ci: Test CMake edge cases (Hennadii Stepanov)

Pull request description:

  This PR follows the minimum g++-11 requirements from bitcoin#29091:

  1. Update gcc version in the "ubuntu-jammy-native" job.

  2. Switch the "cross-build" task to the debian::bookworm image, which effectively bumps `x86_64-w64-mingw32-g++-posix` version to 12.2.

  This PR should be merged before the next sync/rebase cycle, which is about to happen.

ACKs for top commit:
  m3dwards:
    utACK 475cf6d
  pablomartin4btc:
    cr ACK 475cf6d

Tree-SHA512: 9413a415e0f13754a04ba97ff5d8da2ae5f00385928ff02b07a564dafe48aa397fbd9299f4fa79983997aed00a95039ee5cdc441cf49baa37e40a27e70b368db
  • Loading branch information
hebasto committed Apr 16, 2024
2 parents a0254c1 + 475cf6d commit bdaa036
Showing 1 changed file with 7 additions and 4 deletions.
11 changes: 7 additions & 4 deletions .github/workflows/cmake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ jobs:

- name: Generate build system
run: |
cmake -B build -DCMAKE_C_COMPILER=gcc-10 -DCMAKE_CXX_COMPILER=g++-10 -DBoost_INCLUDE_DIR="${PWD}/${{ matrix.conf.boost_archive }}" -DENABLE_WALLET=ON -DWITH_EXTERNAL_SIGNER=ON -DWITH_MINIUPNPC=ON -DWITH_NATPMP=ON -DWITH_ZMQ=ON -DWITH_USDT=ON -DWERROR=ON
cmake -B build -DCMAKE_C_COMPILER=gcc-11 -DCMAKE_CXX_COMPILER=g++-11 -DBoost_INCLUDE_DIR="${PWD}/${{ matrix.conf.boost_archive }}" -DENABLE_WALLET=ON -DWITH_EXTERNAL_SIGNER=ON -DWITH_MINIUPNPC=ON -DWITH_NATPMP=ON -DWITH_ZMQ=ON -DWITH_USDT=ON -DWERROR=ON
- name: Build
working-directory: build
Expand Down Expand Up @@ -260,7 +260,8 @@ jobs:
cross-build:
name: ${{ matrix.host.name }}
runs-on: ubuntu-22.04
runs-on: ubuntu-latest
container: debian:bookworm

strategy:
fail-fast: false
Expand Down Expand Up @@ -295,10 +296,12 @@ jobs:
skip_install: 'true'
- name: 'macOS x86_64'
triplet: 'x86_64-apple-darwin'
packages: 'zip'
macos_sdk: 'Xcode-15.0-15A240d-extracted-SDK-with-libcxx-headers'
configure_options: '-DWERROR=ON'
- name: 'macOS arm64'
triplet: 'arm64-apple-darwin'
packages: 'zip'
macos_sdk: 'Xcode-15.0-15A240d-extracted-SDK-with-libcxx-headers'
configure_options: '-DWERROR=ON'

Expand All @@ -308,8 +311,8 @@ jobs:

- name: Install dependency packages
run: |
sudo apt-get update
sudo apt-get install --no-install-recommends ccache ${{ matrix.host.packages }}
apt-get update
apt-get install --no-install-recommends -y autoconf automake binutils bison ca-certificates ccache cmake curl g++ lbzip2 libtool make patch pkg-config python3 tree xz-utils wget ${{ matrix.host.packages }}
echo "CCACHE_DIR=${{ runner.temp }}/ccache" >> "$GITHUB_ENV"
- name: Depends fingerprint (1)
Expand Down

0 comments on commit bdaa036

Please sign in to comment.