fixup! ci: Test CMake edge cases

Bump clang version to 15. Drop jobs with clang 14.
hebasto · Apr 29, 2024 · c08acdb · c08acdb
1 parent 2fc8782
commit c08acdb
Showing 1 changed file with 5 additions and 12 deletions.
diff --git 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: