From 1dc6194f22e04c949cef7cccec5326b7f03c9904 Mon Sep 17 00:00:00 2001
From: Etienne Wodey <etienne.wodey@aqt.eu>
Date: Mon, 19 Aug 2024 11:33:38 +0200
Subject: [PATCH 1/5] workflows: test against LLVM 18.1

---
 .github/workflows/test.yml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 4a07879d3e0..6cb2968ba00 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -39,6 +39,7 @@ 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
@@ -46,11 +47,13 @@ jobs:
             llvm-version: ["16.0", "16-0"]
           - os: ubuntu-22.04
             llvm-version: ["17.0", "17-0"]
+          - os: ubuntu-22.04
+            llvm-version: ["18.1", "18-0"]
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v4
       - name: Install LLVM and Clang
-        uses: KyleMayes/install-llvm-action@v1
+        uses: KyleMayes/install-llvm-action@v2
         with:
           version: ${{ matrix.llvm-version[0] }}
       - name: llvm-config
@@ -70,7 +73,7 @@ jobs:
     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

From 7734b55f1c9d5f6010b6e75921b18150d8e5e188 Mon Sep 17 00:00:00 2001
From: Etienne Wodey <etienne.wodey@aqt.eu>
Date: Mon, 19 Aug 2024 18:10:01 +0200
Subject: [PATCH 2/5] workflows: remove testing on LLVM < 7.1.

---
 .github/workflows/test.yml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 6cb2968ba00..141a374ae1d 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -25,10 +25,7 @@ jobs:
     strategy:
       matrix:
         llvm-version:
-          - ["4.0", "4-0"]
-          - ["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"]

From f8f9729567205f47443cf16af64254b884a0afe3 Mon Sep 17 00:00:00 2001
From: Etienne Wodey <etienne.wodey@aqt.eu>
Date: Mon, 19 Aug 2024 21:04:17 +0200
Subject: [PATCH 3/5] workflows: use ubuntu-20.04 for llvm 18

---
 .github/workflows/test.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 141a374ae1d..344455c2781 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -39,13 +39,11 @@ jobs:
           - ["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"]
-          - os: ubuntu-22.04
-            llvm-version: ["18.1", "18-0"]
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v4

From a25308b3dc74b91ea39c7c8c16856c41fd26f265 Mon Sep 17 00:00:00 2001
From: Etienne Wodey <etienne.wodey@aqt.eu>
Date: Tue, 20 Aug 2024 23:08:29 +0200
Subject: [PATCH 4/5] workflows: use install-llvm-action@v1 for llvm <= 7

---
 .github/workflows/test.yml | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 344455c2781..00c7b04cea7 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -25,6 +25,10 @@ jobs:
     strategy:
       matrix:
         llvm-version:
+          - ["4.0", "4-0"]
+          - ["5.0", "5-0"]
+          - ["6.0", "6-0"]
+          - ["7.0", "7-0"]
           - ["7.1", "7-0"]
           - ["8.0", "8-0"]
           - ["9.0", "9-0"]
@@ -47,8 +51,14 @@ jobs:
     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

From f0547c5bcb4ad5f26d10b501f881fd0f70ff538b Mon Sep 17 00:00:00 2001
From: Etienne Wodey <etienne.wodey@aqt.eu>
Date: Tue, 20 Aug 2024 23:20:10 +0200
Subject: [PATCH 5/5] workflows: build docs against LLVM 18

---
 .github/workflows/test.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 00c7b04cea7..f5178379728 100644
--- 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:
@@ -73,7 +73,7 @@ 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: