Skip to content

Commit aa0518e

Browse files
Totto16Totto16
authored
Merge pull request #215 from OpenBrickProtocolFoundation/update_to_clang_20
build: Update to clang 20
2 parents 240fb14 + cda5582 commit aa0518e

File tree

5 files changed

+28
-32
lines changed

5 files changed

+28
-32
lines changed

‎.github/workflows/build.yml‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -145,21 +145,21 @@ jobs:
145145
run: |
146146
wget https://apt.llvm.org/llvm.sh
147147
chmod +x llvm.sh
148-
sudo ./llvm.sh 19
149-
sudo apt-get install libc++-19* libc++abi*19* -y --no-install-recommends
150-
echo "CC=clang-19" >> "$GITHUB_ENV"
151-
echo "CXX=clang++-19" >> "$GITHUB_ENV"
152-
echo "OBJC=clang-19" >> "$GITHUB_ENV"
148+
sudo ./llvm.sh 20
149+
sudo apt-get install libc++-20* libc++abi*20* -y --no-install-recommends
150+
echo "CC=clang-20" >> "$GITHUB_ENV"
151+
echo "CXX=clang++-20" >> "$GITHUB_ENV"
152+
echo "OBJC=clang-20" >> "$GITHUB_ENV"
153153
154154
- name: Setup Clang (Linux) (libstdc++)
155155
if: matrix.config.os == 'ubuntu' && matrix.config.use-clang == true && (! matrix.config.use-clang_stdlib)
156156
run: |
157157
wget https://apt.llvm.org/llvm.sh
158158
chmod +x llvm.sh
159-
sudo ./llvm.sh 19
160-
echo "CC=clang-19" >> "$GITHUB_ENV"
161-
echo "CXX=clang++-19" >> "$GITHUB_ENV"
162-
echo "OBJC=clang-19" >> "$GITHUB_ENV"
159+
sudo ./llvm.sh 20
160+
echo "CC=clang-20" >> "$GITHUB_ENV"
161+
echo "CXX=clang++-20" >> "$GITHUB_ENV"
162+
echo "OBJC=clang-20" >> "$GITHUB_ENV"
163163
164164
- name: Setup GCC (Linux)
165165
if: matrix.config.os == 'ubuntu' && matrix.config.use-clang == false
@@ -182,10 +182,10 @@ jobs:
182182
if: matrix.config.os == 'macos'
183183
run: |
184184
brew update
185-
brew install llvm@19 lld@19
186-
echo "$(brew --prefix)/opt/llvm@19/bin:$(brew --prefix)/opt/lld@19/bin" >> $GITHUB_PATH
187-
echo "LDFLAGS=-L$(brew --prefix)/opt/llvm@19/lib -L$(brew --prefix)/opt/llvm@19/lib/c++ -Wl,-rpath,$(brew --prefix)/opt/llvm@19/lib/c++ -L$(brew --prefix)/opt/lld@19/lib" >> "$GITHUB_ENV"
188-
echo "CPPFLAGS=-I$(brew --prefix)/opt/llvm@19/include -I$(brew --prefix)/opt/lld@19/include" >> "$GITHUB_ENV"
185+
brew install llvm@20 lld@20
186+
echo "$(brew --prefix)/opt/llvm@20/bin:$(brew --prefix)/opt/lld@20/bin" >> $GITHUB_PATH
187+
echo "LDFLAGS=-L$(brew --prefix)/opt/llvm@20/lib -L$(brew --prefix)/opt/llvm@20/lib/c++ -Wl,-rpath,$(brew --prefix)/opt/llvm@20/lib/c++ -L$(brew --prefix)/opt/lld@20/lib" >> "$GITHUB_ENV"
188+
echo "CPPFLAGS=-I$(brew --prefix)/opt/llvm@20/include -I$(brew --prefix)/opt/lld@20/include" >> "$GITHUB_ENV"
189189
echo "CC=clang" >> "$GITHUB_ENV"
190190
echo "CXX=clang++" >> "$GITHUB_ENV"
191191
echo "OBJC=clang" >> "$GITHUB_ENV"

‎.github/workflows/lint.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ jobs:
2424
run: |
2525
wget https://apt.llvm.org/llvm.sh
2626
chmod +x llvm.sh
27-
sudo ./llvm.sh 19
28-
echo "CC=clang-19" >> "$GITHUB_ENV"
29-
echo "CXX=clang++-19" >> "$GITHUB_ENV"
30-
echo "OBJC=clang-19" >> "$GITHUB_ENV"
27+
sudo ./llvm.sh 20
28+
echo "CC=clang-20" >> "$GITHUB_ENV"
29+
echo "CXX=clang++-20" >> "$GITHUB_ENV"
30+
echo "OBJC=clang-20" >> "$GITHUB_ENV"
3131
3232
- name: Prepare compile_commands.json
3333
run: |
@@ -44,7 +44,7 @@ jobs:
4444
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4545
with:
4646
style: file
47-
version: 19
47+
version: 20
4848
database: build
4949
files-changed-only: ${{ github.event_name != 'workflow_dispatch' }}
5050
lines-changed-only: ${{ github.event_name != 'workflow_dispatch' }}

‎.github/workflows/musl.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
build:
1111
name: ${{ matrix.config.name }}
1212
runs-on: ubuntu-24.04
13-
container: alpine:3.21
13+
container: alpine:3.22
1414

1515
strategy:
1616
fail-fast: false
@@ -32,9 +32,9 @@ jobs:
3232
- name: Install dependencies
3333
run: |
3434
apk update
35-
apk add wget meson ca-certificates samurai git openssl-dev openssl pkgconf sdl2 sdl2-dev sdl2_mixer-dev sdl2_ttf-dev sdl2_mixer-dev sdl2_image-dev dbus-dev ${{ ( matrix.config.use-clang == true ) && 'clang19' || 'gcc g++' }} ${{ ( matrix.config.use-clang == true && matrix.config.use-clang_stdlib == true ) && 'libc++ libc++-dev llvm-libunwind llvm-libunwind-dev ' || '' }}
36-
echo "CC=${{ matrix.config.use-clang == true && 'clang-19' || 'gcc' }}" >> "$GITHUB_ENV"
37-
echo "CXX=${{ matrix.config.use-clang == true && 'clang++-19' || 'g++' }}" >> "$GITHUB_ENV"
35+
apk add wget meson ca-certificates samurai git openssl-dev openssl pkgconf sdl2 sdl2-dev sdl2_mixer-dev sdl2_ttf-dev sdl2_mixer-dev sdl2_image-dev dbus-dev ${{ ( matrix.config.use-clang == true ) && 'clang20' || 'gcc g++' }} ${{ ( matrix.config.use-clang == true && matrix.config.use-clang_stdlib == true ) && 'libc++ libc++-dev llvm-libunwind llvm-libunwind-dev ' || '' }}
36+
echo "CC=${{ matrix.config.use-clang == true && 'clang-20' || 'gcc' }}" >> "$GITHUB_ENV"
37+
echo "CXX=${{ matrix.config.use-clang == true && 'clang++-20' || 'g++' }}" >> "$GITHUB_ENV"
3838
3939
- uses: actions/checkout@v4
4040
with:

‎.github/workflows/test.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ jobs:
1919
run: |
2020
wget https://apt.llvm.org/llvm.sh
2121
chmod +x llvm.sh
22-
sudo ./llvm.sh 19
23-
sudo apt-get install libc++-19* libc++abi*19* llvm-19 -y --no-install-recommends
24-
echo "CC=clang-19" >> "$GITHUB_ENV"
25-
echo "CXX=clang++-19" >> "$GITHUB_ENV"
22+
sudo ./llvm.sh 20
23+
sudo apt-get install libc++-20* libc++abi*20* llvm-20 -y --no-install-recommends
24+
echo "CC=clang-20" >> "$GITHUB_ENV"
25+
echo "CXX=clang++-20" >> "$GITHUB_ENV"
2626
2727
# NOTE: meson has no dependencies, so --break-system-packages doesn't really break anything!
2828
- name: Setup meson

‎tools/options/meson.build‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,6 @@ if get_option('run_in_ci')
4141
system_name = 'msys2'
4242
endif
4343

44-
clang_19_compiler = {
45-
'id': 'clang',
46-
'checks': ['>=19', '<20'],
47-
}
4844
clang_20_compiler = {
4945
'id': 'clang',
5046
'checks': ['>=20', '<21'],
@@ -85,10 +81,10 @@ if get_option('run_in_ci')
8581
'compilers': [gcc_14_compiler],
8682
},
8783
'linux': {
88-
'compilers': [clang_19_compiler, gcc_14_compiler],
84+
'compilers': [clang_20_compiler, gcc_14_compiler],
8985
},
9086
'darwin': {
91-
'compilers': [clang_19_compiler],
87+
'compilers': [clang_20_compiler],
9288
},
9389
}
9490

0 commit comments

Comments
 (0)