Fix Clang build on CI

beman-project · Jul 16, 2024 · 32db0ab · 32db0ab
1 parent 0282cd5
commit 32db0ab
Showing 1 changed file with 12 additions and 6 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -48,14 +48,20 @@ jobs:
             libclang-common-${{matrix.config.installed_clang_version}}-dev \
             libclang-${{matrix.config.installed_clang_version}}-dev \
             libclang-cpp${{matrix.config.installed_clang_version}}-dev \
-            libunwind-${{matrix.config.installed_clang_version}}-dev
+            libunwind-${{matrix.config.installed_clang_version}}-dev \
+            libc++-dev libc++1 libc++abi-dev libc++abi1
           # Install LLVM+Clang.
+          CLANG_VERSION=$(echo ${{matrix.config.toolchain}} | cut -d '-' -f2)
           wget https://apt.llvm.org/llvm.sh
           chmod +x llvm.sh
-          sudo ./llvm.sh ${{matrix.config.clang_version}} all
-          sudo apt-get install libc++-dev libc++1 libc++abi-dev libc++abi1
-          find /usr/lib -name libc++.so*
+          sudo ./llvm.sh ${CLANG_VERSION} all
+          sudo apt-get install \
+            libc++-${CLANG_VERSION}-dev \
+            libc++1-${CLANG_VERSION} \
+            libc++abi-${CLANG_VERSION}-dev \
+            libc++abi1-${CLANG_VERSION}
           ${{matrix.config.toolchain}} --version
+          find /usr/lib/llvm-${CLANG_VERSION} -name libc++.so*
       - name: Install GCC
         if: startsWith(matrix.config.name, 'Ubuntu GCC')
         run: |
@@ -67,7 +73,7 @@ jobs:
           GCC_VERSION=$(echo ${{matrix.config.toolchain}} | cut -d '-' -f2)
           echo "GCC_VERSION=$GCC_VERSION"
           sudo apt-get install g++-${GCC_VERSION} gcc-${GCC_VERSION}
-          find /usr/lib -name libstdc++.so*
+          find /usr -name libstdc++.so*
           ${{matrix.config.toolchain}} --version
       - name: CMake Configure
         run: |
@@ -82,7 +88,7 @@ jobs:
         run: |
           set -x
           cmake --build .build --config Asan --target all -- -k 0
-      - name: CTest
+      - name: CMake Test
         run: |
           set -x
           cd .build