[CI: Switch back to Ubuntu 20 and LLVM v16.0.0]

bangbangsheshotmedown · Jun 11, 2023 · 5654d52 · 5654d52
1 parent 15013d1
commit 5654d52
Showing 1 changed file with 4 additions and 11 deletions.
diff --git a/.github/workflows/supported_llvm_versions.yml b/.github/workflows/supported_llvm_versions.yml
@@ -15,10 +15,10 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - job_name: Ubuntu 22.04, LLVM 16, latest LDC beta
-            os: ubuntu-22.04
+          - job_name: Ubuntu 20.04, LLVM 16, latest LDC beta
+            os: ubuntu-20.04
             host_dc: ldc-beta
-            llvm_version: 16.0.3
+            llvm_version: 16.0.0
           - job_name: Ubuntu 20.04, LLVM 15, latest LDC beta
             os: ubuntu-20.04
             host_dc: ldc-beta
@@ -81,12 +81,7 @@ jobs:
           set -eux
           sudo apt-get update
           # Don't use latest gdb v10+ from Ubuntu toolchain PPA with regressions, use official v9
-          version='${{ matrix.llvm_version }}'
-          if [[ "$version" =~ ^1[6-9]\. ]]; then # LLVM 16.0.3+
-            sudo apt-get install gdb llvm
-          else
-            sudo apt-get install gdb=9.1-0ubuntu1 llvm
-          fi
+          sudo apt-get install gdb=9.1-0ubuntu1 llvm
 
       - name: Try to restore cached LLVM
         uses: actions/cache@v2
@@ -104,8 +99,6 @@ jobs:
           version='${{ matrix.llvm_version }}'
           if [[ '${{ runner.os }}' == macOS ]]; then
             suffix='x86_64-apple-darwin'
-          elif [[ "$version" =~ ^1[6-9]\. ]]; then # LLVM 16.0.3+
-            suffix='x86_64-linux-gnu-ubuntu-22.04' # LLVM 13.0.1+
           elif [[ "$version" =~ ^1[3-9]\. ]]; then
             suffix='x86_64-linux-gnu-ubuntu-18.04' # LLVM 13.0.1+
           else