Add LLVM 15 to github actions, except on windows

Akuli · Jan 14, 2025 · c4d1aab · c4d1aab
1 parent 3252912
commit c4d1aab
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -40,7 +40,7 @@ jobs:
     runs-on: ubuntu-22.04
     strategy:
       matrix:
-        llvm-version: [11, 13, 14]
+        llvm-version: [11, 13, 14, 15]
         # Testing all levels because there was a bug that only happened with -O1. (#224)
         opt-level: ['-O0', '-O1', '-O2', '-O3']
     steps:
@@ -70,9 +70,11 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - run: sudo apt update
-      - run: sudo apt install -y llvm-{11,13,14}-dev clang-{11,13,14} make
+      - run: sudo apt install -y llvm-{11,13,14,15}-dev clang-{11,13,14,15} make
       - run: LLVM_CONFIG=llvm-config-11 ./doctest.sh
       - run: make clean
       - run: LLVM_CONFIG=llvm-config-13 ./doctest.sh
       - run: make clean
       - run: LLVM_CONFIG=llvm-config-14 ./doctest.sh
+      - run: make clean
+      - run: LLVM_CONFIG=llvm-config-15 ./doctest.sh
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -12,11 +12,15 @@ jobs:
       matrix:
         # Testing all levels because there was a bug that only happened with -O1. (#224)
         opt-level: ['-O0', '-O1', '-O2', '-O3']
+        llvm-version: ['14', '15']
+    env:
+      LLVM_CONFIG: "/usr/local/opt/llvm@${{ matrix.llvm-version }}/bin/llvm-config"
     steps:
       - uses: actions/checkout@v3
-      - run: brew install bash diffutils llvm@14
-
-      - run: make
+      - run: brew install bash diffutils llvm@${{ matrix.llvm-version }}
+      - name: "Select LLVM version"
+        run: |
+          echo "LLVM_CONFIG=/usr/local/opt/llvm@${{ matrix.llvm-version }}/bin/llvm-config" >> $GITHUB_ENV
       - name: "Compile and test stage 1 compiler"
         run: ./runtests.sh --verbose --jou-flags "${{ matrix.opt-level }}" --stage1
       - name: "Compile and test stage 2 compiler"
@@ -40,5 +44,5 @@ jobs:
     timeout-minutes: 5
     steps:
       - uses: actions/checkout@v3
-      - run: brew install bash diffutils llvm@14
+      - run: brew install bash diffutils llvm@15
       - run: ./doctest.sh