Skip to content

Commit

Permalink
Merge #159: cmake, ci: Bump clang version to 15
Browse files Browse the repository at this point in the history
8fd40d4 fixup! ci: Test CMake edge cases (Hennadii Stepanov)
c08acdb fixup! ci: Test CMake edge cases (Hennadii Stepanov)

Pull request description:

  See bitcoin#29165.

ACKs for top commit:
  m3dwards:
    utACK 8fd40d4

Tree-SHA512: 4f74730de2de7767875357044763f9aa73ba0e973a9af2572989f51bf631cd082279f08b7141ef8e56765cecf327ee31406bd83d05eb2a5125d520f773d0210f
  • Loading branch information
hebasto committed Apr 29, 2024
2 parents 2fc8782 + 8fd40d4 commit 4561f76
Showing 1 changed file with 6 additions and 13 deletions.
19 changes: 6 additions & 13 deletions .github/workflows/cmake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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'
Expand Down Expand Up @@ -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: |
Expand Down Expand Up @@ -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'
Expand Down Expand Up @@ -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:
Expand Down

0 comments on commit 4561f76

Please sign in to comment.