Skip to content

Commit bdaa036

Browse files
committed
Merge #147: cmake, ci: Ensure minimum supported g++ version in CI jobs
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
2 parents a0254c1 + 475cf6d commit bdaa036

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

.github/workflows/cmake.yml

+7-4
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ jobs:
227227

228228
- name: Generate build system
229229
run: |
230-
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
230+
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
231231
232232
- name: Build
233233
working-directory: build
@@ -260,7 +260,8 @@ jobs:
260260
261261
cross-build:
262262
name: ${{ matrix.host.name }}
263-
runs-on: ubuntu-22.04
263+
runs-on: ubuntu-latest
264+
container: debian:bookworm
264265

265266
strategy:
266267
fail-fast: false
@@ -295,10 +296,12 @@ jobs:
295296
skip_install: 'true'
296297
- name: 'macOS x86_64'
297298
triplet: 'x86_64-apple-darwin'
299+
packages: 'zip'
298300
macos_sdk: 'Xcode-15.0-15A240d-extracted-SDK-with-libcxx-headers'
299301
configure_options: '-DWERROR=ON'
300302
- name: 'macOS arm64'
301303
triplet: 'arm64-apple-darwin'
304+
packages: 'zip'
302305
macos_sdk: 'Xcode-15.0-15A240d-extracted-SDK-with-libcxx-headers'
303306
configure_options: '-DWERROR=ON'
304307

@@ -308,8 +311,8 @@ jobs:
308311

309312
- name: Install dependency packages
310313
run: |
311-
sudo apt-get update
312-
sudo apt-get install --no-install-recommends ccache ${{ matrix.host.packages }}
314+
apt-get update
315+
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 }}
313316
echo "CCACHE_DIR=${{ runner.temp }}/ccache" >> "$GITHUB_ENV"
314317
315318
- name: Depends fingerprint (1)

0 commit comments

Comments
 (0)