Skip to content

Commit 3b5d25a

Browse files
authored
Update build_cmake.yml
1 parent dbe007c commit 3b5d25a

File tree

1 file changed

+1
-19
lines changed

1 file changed

+1
-19
lines changed

.github/workflows/build_cmake.yml

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -135,24 +135,6 @@ jobs:
135135
if: startsWith(matrix.config.os,'macos-')
136136

137137
- name: Install libclang (Ubuntu 24.04)
138-
run: |
139-
sudo apt update
140-
sudo apt remove llvm-13 llvm-13-dev llvm-13-tools llvm-13-runtime clang-13 clang-format-13 libclang-common-13-dev libclang-cpp13 libclang1-13 libllvm13
141-
sudo apt remove llvm-15 llvm-15-dev llvm-15-tools llvm-15-runtime clang-15 clang-format-15 libclang-common-15-dev libclang-cpp15 libclang1-15 libllvm15
142-
sudo apt-get autoremove
143-
sudo apt-get clean
144-
sudo apt install libclang-common-14-dev libclang-14-dev
145-
apt list --installed | egrep '(clang|llvm)'
146-
ls -d /usr/lib/llvm-*/include/
147-
sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-14 100
148-
sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-14 100
149-
ls -al /usr/bin/clang++
150-
ls -al /etc/alternatives/clang++
151-
which clang++
152-
clang++ -v
153-
if: matrix.config.cc == 'clang' && matrix.config.os == 'ubuntu-24.04'
154-
155-
- name: Install libclang (Ubuntu 24.04 ARM)
156138
run: |
157139
sudo apt update
158140
sudo apt remove llvm-14 llvm-14-dev llvm-14-tools llvm-14-runtime clang-14 clang-format-14 libclang-common-14-dev libclang-cpp14 libclang1-14 libllvm14
@@ -170,7 +152,7 @@ jobs:
170152
ls -al /etc/alternatives/clang++
171153
which clang++
172154
clang++ -v
173-
if: matrix.config.os == 'ubuntu-24.04-arm'
155+
if: matrix.config.cc == 'clang' && (matrix.config.os == 'ubuntu-24.04' || matrix.config.os == 'ubuntu-24.04-arm')
174156

175157
- name: Install libxapian (Ubuntu 24.04)
176158
run: |

0 commit comments

Comments
 (0)