Skip to content

cmake, ci: Bump clang version to 15 #159

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hebasto merged 2 commits into from
Apr 29, 2024
Merged

cmake, ci: Bump clang version to 15 #159

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c08acdb
fixup! ci: Test CMake edge cases
hebasto Apr 29, 2024
8fd40d4
fixup! ci: Test CMake edge cases
hebasto Apr 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 6 additions & 13 deletions .github/workflows/cmake.yml
View file
Open in desktop
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