Merge branch 'master' into module-write-asref-path

TheDan64 · Aug 22, 2024 · e81821d · e81821d
2 parents dbc8b95 + a4e37ac
commit e81821d
Showing 1 changed file with 14 additions and 6 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -4,8 +4,8 @@ on: [push, pull_request]
 
 env:
   CARGO_TERM_COLOR: always
-  DOC_LLVM_FEATURE: llvm17-0
-  DOC_LLVM_VERSION: "17.0"
+  DOC_LLVM_FEATURE: llvm18-0
+  DOC_LLVM_VERSION: "18.1"
   DOC_PATH: target/doc
 
 jobs:
@@ -29,6 +29,7 @@ jobs:
           - ["5.0", "5-0"]
           - ["6.0", "6-0"]
           - ["7.0", "7-0"]
+          - ["7.1", "7-0"]
           - ["8.0", "8-0"]
           - ["9.0", "9-0"]
           - ["10.0", "10-0"]
@@ -39,18 +40,25 @@ jobs:
           - ["15.0", "15-0"]
           - ["16.0", "16-0"]
           - ["17.0", "17-0"]
+          - ["18.1", "18-0"]
         include:
           - os: ubuntu-20.04
-          # only use ubuntu-22.04 for llvm 16 and higher
+          # only use ubuntu-22.04 for llvm 16 and llvm 17
           - os: ubuntu-22.04
             llvm-version: ["16.0", "16-0"]
           - os: ubuntu-22.04
             llvm-version: ["17.0", "17-0"]
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v4
-      - name: Install LLVM and Clang
+      - name: Install LLVM and Clang (LLVM >= 7.1)
+        uses: KyleMayes/install-llvm-action@v2
+        if: ${{ matrix.llvm-version[0] > 7 }}
+        with:
+          version: ${{ matrix.llvm-version[0] }}
+      - name: Install LLVM and Clang (LLVM <= 7)
         uses: KyleMayes/install-llvm-action@v1
+        if: ${{ matrix.llvm-version[0] <= 7 }}
         with:
           version: ${{ matrix.llvm-version[0] }}
       - name: llvm-config
@@ -65,12 +73,12 @@ jobs:
         run: cargo build --example kaleidoscope --features llvm${{ matrix.llvm-version[1] }} --verbose
   doc:
     name: Documentation
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     needs: [typos, tests]
     if: github.event_name == 'push' && github.ref == 'refs/heads/master'
     steps:
       - uses: actions/checkout@v4
-      - uses: KyleMayes/install-llvm-action@v1
+      - uses: KyleMayes/install-llvm-action@v2
         with:
           version: ${{ env.DOC_LLVM_VERSION }}
       - name: Install Rust Nightly