From c08acdbfedf2cad41524d054563c1a8ff60bea32 Mon Sep 17 00:00:00 2001
From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com>
Date: Mon, 29 Apr 2024 14:17:14 +0100
Subject: [PATCH 1/2] fixup! ci: Test CMake edge cases

Bump clang version to 15.

Drop jobs with clang 14.
---
 .github/workflows/cmake.yml | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
index 2b61e7aa9da3a8..1a51d9914815af 100644
--- a/.github/workflows/cmake.yml
+++ b/.github/workflows/cmake.yml
@@ -273,12 +273,10 @@ jobs:
         host:
           - name: 'Linux 32-bit, Clang, link to libatomic'
             triplet: 'i686-pc-linux-gnu'
-            packages: 'clang-14 g++-multilib'
-            c_compiler: 'clang-14 -m32'
-            cxx_compiler: 'clang++-14 -m32'
+            packages: 'clang-15 g++-multilib'
+            c_compiler: 'clang-15 -m32'
+            cxx_compiler: 'clang++-15 -m32'
             depends_options: ''
-            # For -Wno-error=unreachable-code, please refer to https://github.com/bitcoin/bitcoin/issues/29334
-            configure_env: 'env CXXFLAGS="-Wno-error=unreachable-code"'
             configure_options: '-DWERROR=ON'
           - name: 'Linux 64-bit, multiprocess'
             triplet: 'x86_64-pc-linux-gnu'
@@ -376,7 +374,7 @@ jobs:
 
       - name: Generate build system
         run: |
-          ${{ matrix.host.configure_env }} cmake -B build --toolchain depends/${{ matrix.host.triplet }}/toolchain.cmake ${{ matrix.host.configure_options }}
+          cmake -B build --toolchain depends/${{ matrix.host.triplet }}/toolchain.cmake ${{ matrix.host.configure_options }}
 
       - name: Build
         run: |
@@ -533,11 +531,6 @@ jobs:
           - name: 'macOS 14 native, arm64'
             os: macos-14
         xcode:
-          - name: 'Xcode 14.3'
-            id: 'xcode-14.3'
-            path: '/Applications/Xcode_14.3.app'
-            # For -Wno-error=unreachable-code, please refer to https://github.com/bitcoin/bitcoin/issues/29334
-            configure_env: 'env CXXFLAGS="-Wno-error=unreachable-code"'
           - name: 'Xcode 15.2'
             id: 'xcode-15.2'
             path: '/Applications/Xcode_15.2.app'
@@ -580,7 +573,7 @@ jobs:
 
       - name: Generate build system
         run: |
-          ${{ matrix.xcode.configure_env }} cmake -B build --preset ci-darwin
+          cmake -B build --preset ci-darwin
 
       - name: Build
         env:

From 8fd40d42475cccb7323e488a572ddd5f8d42b2f1 Mon Sep 17 00:00:00 2001
From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com>
Date: Sun, 21 Apr 2024 15:42:58 +0100
Subject: [PATCH 2/2] fixup! ci: Test CMake edge cases

On Ubuntu 22.04, the default gcc is 11.2.0.
---
 .github/workflows/cmake.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
index 1a51d9914815af..08dd10b21abfe7 100644
--- a/.github/workflows/cmake.yml
+++ b/.github/workflows/cmake.yml
@@ -231,7 +231,7 @@ jobs:
 
       - name: Generate build system
         run: |
-          cmake -B build --preset ci-linux -DCMAKE_C_COMPILER=gcc-11 -DCMAKE_CXX_COMPILER=g++-11 -DBoost_INCLUDE_DIR="${PWD}/${{ matrix.conf.boost_archive }}"
+          cmake -B build --preset ci-linux -DBoost_INCLUDE_DIR="${PWD}/${{ matrix.conf.boost_archive }}"
 
       - name: Build
         working-directory: build