Skip to content

Commit d56653d

Browse files
committed
[ci] Use unversioned clang/clang++.
1 parent 870783c commit d56653d

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

.github/actions/install-cmake-build-dependencies/action.yaml

+4-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,10 @@ runs:
1212
brew install bazelisk ccache cmake zlib
1313
else
1414
# Compiler
15-
sudo apt-get install clang++-9 lld-9 tar bzip2 ninja-build
16-
sudo apt-get install tar bzip2 ninja-build
15+
sudo apt-get install -y bzip2 clang-9 clang++-9 lld-9 tar bzip2 ninja-build tar ninja-build
16+
sudo ln -s $(which clang++-9) /usr/bin/clang++
17+
sudo ln -s $(which clang-9) /usr/bin/clang
18+
sudo ln -s $(which lld-9) /usr/bin/lld
1719
# CMake
1820
wget https://github.com/Kitware/CMake/releases/download/v3.20.5/cmake-3.20.5-linux-x86_64.sh -O /tmp/cmake.sh
1921
sudo bash /tmp/cmake.sh --prefix=/usr/local --exclude-subdir --skip-license

.github/workflows/ci.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ jobs:
5656
run: |
5757
cmake \
5858
-GNinja \
59-
-DCMAKE_C_COMPILER=clang-9 \
60-
-DCMAKE_CXX_COMPILER=clang++-9 \
59+
-DCMAKE_C_COMPILER=clang \
60+
-DCMAKE_CXX_COMPILER=clang++ \
6161
-DCMAKE_EXE_LINKER_FLAGS_INIT="-fuse-ld=lld" \
6262
-DCMAKE_MODULE_LINKER_FLAGS_INIT="-fuse-ld=lld" \
6363
-DCMAKE_SHARED_LINKER_FLAGS_INIT="-fuse-ld=lld" \

0 commit comments

Comments
 (0)