Skip to content

Commit fb1ecf4

Browse files
authored
Merge pull request #144 from OpenBrickProtocolFoundation/142-update-to-llvm-18
update to clang / llvm 18
2 parents ecc8144 + c237aa4 commit fb1ecf4

File tree

4 files changed

+14
-23
lines changed

4 files changed

+14
-23
lines changed

.github/workflows/android.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
uses: actions/setup-java@v4
4040
with:
4141
distribution: 'temurin'
42-
java-version: '17'
42+
java-version: '21'
4343

4444
- name: Setup Android SDK
4545
uses: android-actions/setup-android@v3

.github/workflows/cpp-linter.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- name: Setup Clang
2323
uses: egor-tensin/setup-clang@v1
2424
with:
25-
version: 17
25+
version: 18
2626
platform: x64
2727

2828
- name: Prepare compile_commands.json
@@ -39,7 +39,7 @@ jobs:
3939
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4040
with:
4141
style: file
42-
version: 17
42+
version: 18
4343
database: build
4444
files-changed-only: ${{ github.event_name != 'workflow_dispatch' }}
4545
lines-changed-only: ${{ github.event_name != 'workflow_dispatch' }}

.github/workflows/meson.yml

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -105,11 +105,11 @@ jobs:
105105
run: |
106106
wget https://apt.llvm.org/llvm.sh
107107
chmod +x llvm.sh
108-
sudo ./llvm.sh 17
109-
sudo apt-get install libc++-17* libc++abi*17* -y
110-
echo "CC=clang-17" >> "$GITHUB_ENV"
111-
echo "CXX=clang++-17" >> "$GITHUB_ENV"
112-
echo "OBJC=clang-17" >> "$GITHUB_ENV"
108+
sudo ./llvm.sh 18
109+
sudo apt-get install libc++-18* libc++abi*18* -y
110+
echo "CC=clang-18" >> "$GITHUB_ENV"
111+
echo "CXX=clang++-18" >> "$GITHUB_ENV"
112+
echo "OBJC=clang-18" >> "$GITHUB_ENV"
113113
114114
115115
- name: Setup GCC (Linux)
@@ -123,7 +123,7 @@ jobs:
123123
if: matrix.config.os == 'macos'
124124
run: |
125125
brew update
126-
brew install llvm@17
126+
brew install llvm@18
127127
echo "$(brew --prefix)/opt/llvm/bin" >> $GITHUB_PATH
128128
echo "LDFLAGS=-L$(brew --prefix)/opt/llvm/lib -L$(brew --prefix)/opt/llvm/lib/c++ -Wl,-rpath,$(brew --prefix)/opt/llvm/lib/c++" >> "$GITHUB_ENV"
129129
echo "CPPFLAGS=-I$(brew --prefix)/opt/llvm/include" >> "$GITHUB_ENV"
@@ -134,19 +134,10 @@ jobs:
134134
echo "CXX_LD=lld" >> "$GITHUB_ENV"
135135
echo "OBJC_LD=lld" >> "$GITHUB_ENV"
136136
137-
- name: Unbreak Python in GHA for 3.11 (MacOS 13 image)
138-
if: matrix.config.os == 'macos' && matrix.config.os-version == 13
139-
run: |
140-
# A workaround for "The `brew link` step did not complete successfully" error.
141-
# See https://github.com/Homebrew/homebrew-core/issues/165793#issuecomment-1991817938
142-
find /usr/local/bin -lname '*/Library/Frameworks/Python.framework/*' -delete
143-
sudo rm -rf /Library/Frameworks/Python.framework/
144-
brew install --force python3 && brew unlink python3 && brew unlink python3 && brew link --overwrite python3
145-
146137
- name: Setup meson (MacOS)
147138
if: matrix.config.os == 'macos'
148139
run: |
149-
brew update
140+
brew update
150141
brew install meson
151142
152143
- name: Setup meson

.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 17
23-
sudo apt-get install libc++-17* libc++abi*17* llvm-17 -y
24-
echo "CC=clang-17" >> "$GITHUB_ENV"
25-
echo "CXX=clang++-17" >> "$GITHUB_ENV"
22+
sudo ./llvm.sh 18
23+
sudo apt-get install libc++-18* libc++abi*18* llvm-18 -y
24+
echo "CC=clang-18" >> "$GITHUB_ENV"
25+
echo "CXX=clang++-18" >> "$GITHUB_ENV"
2626
2727
- name: Setup meson
2828
run: |

0 commit comments

Comments
 (0)