ci: correctly install clang

florianvazelle · Dec 26, 2023 · d8e42bd · d8e42bd
1 parent bd29f7d
commit d8e42bd
Showing 1 changed file with 19 additions and 11 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -23,18 +23,18 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - compiler: g++-10
-            package: g++-10
           - compiler: g++-11
-            package: g++-11
+            package: g++
+            version: 11
           - compiler: g++-12
-            package: g++-12
-          - compiler: clang++-15
-            package: clang-15
+            package: g++
+            version: 12
           - compiler: clang++-16
-            package: clang-16
+            package: clang
+            version: 16
           - compiler: clang++-17
-            package: clang-17
+            package: clang
+            version: 17
 
     runs-on: ubuntu-latest
 
@@ -53,10 +53,18 @@ jobs:
             ${{ env.CPM_SOURCE_CACHE }}
           key: ubuntu-${{ hashFiles('conanfile.txt') }} }}
 
-      - name: Install ${{ matrix.package }}
+      - name: Install g++
+        if: ${{ matrix.package == 'g++' }}
         run: |
           sudo apt-get update
-          sudo apt-get install ${{ matrix.package }}
+          sudo apt-get install g++-${{ matrix.version }}
+
+      - name: Install clang
+        if: ${{ matrix.package == 'clang' }}
+        run: |
+          wget https://apt.llvm.org/llvm.sh
+          chmod u+x llvm.sh
+          sudo ./llvm.sh ${{ matrix.version }}
 
       - name: Setup Python
         uses: actions/setup-python@v5
@@ -88,7 +96,7 @@ jobs:
 
       - name: Install Vulkan SDK
         run: |
-          wget -qO- https://packages.lunarg.com/lunarg-signing-key-pub.asc | sudo tee /etc/apt/trusted.gpg.d/lunarg.asc
+          wget -qO- https://packages.lunarg.com/lunarg-signing-key-pub.asc | sudo tee /etc/apt/trusted.gpg.d/lunarg.asc || true
           sudo wget -qO /etc/apt/sources.list.d/lunarg-vulkan-$UNIX_VULKAN_VERSION-jammy.list http://packages.lunarg.com/vulkan/$UNIX_VULKAN_VERSION/lunarg-vulkan-$UNIX_VULKAN_VERSION-jammy.list
           sudo apt update
           sudo apt install -f vulkan-sdk