CI

jll63 · Aug 15, 2024 · 54046ea · 54046ea
1 parent 876a0df
commit 54046ea
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 7 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -10,14 +10,14 @@ on: [push, pull_request, workflow_dispatch]
 
 jobs:
   job:
-    name: ${{ matrix.os }}-${{ matrix.linkage }}-${{ matrix.config }}-${{ matrix.compiler }}
+    name: ${{ matrix.os }}-${{ matrix.compiler }}-${{ matrix.linkage }}-${{ matrix.config }}
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
         config: [dbg, rel]
-        linkage: [headers-only, shared]
+        linkage: [static, shared]
         include:
           # - os: windows-latest
           #   triplet: x64-windows
@@ -35,7 +35,14 @@ jobs:
             config: rel
             test_preamble: $env:PATH +=  ";" + (Get-Item .).FullName + "\builds\shared\src\Release"
           - os: ubuntu-latest
-            compiler: clang++-15
+            compiler: clang++-18
+            pre_configure: dev/ci-pre-configure 18
+          - os: ubuntu-latest
+            compiler: clang++-19
+            pre_configure: dev/ci-pre-configure 19
+          - os: ubuntu-latest
+            compiler: clang++-20
+            pre_configure: dev/ci-pre-configure 20
           - os: ubuntu-latest
             compiler: g++-12
           - os: macos-latest
@@ -116,13 +123,14 @@ jobs:
       # cache to store the built packages artifacts.
       - name: Restore from cache the dependencies and generate project files
         run: |
-          cmake --preset ${{ matrix.linkage }} -DCMAKE_CXX_COMPILER=${{ matrix.compiler }}
+          ${{ matrix.pre_configure }}
+          cmake --preset ninja-${{ matrix.compiler }}-${{ matrix.linkage }} -DCMAKE_CXX_COMPILER=${{ matrix.compiler }}
 
       - name: Build
         run: |
-          cmake --build --preset build-${{ matrix.linkage}}-${{ matrix.config }}
+          cmake --build --preset build-ninja-${{ matrix.compiler }}-${{ matrix.linkage}}-${{ matrix.config }}
 
       - name: Test
         run: |
           ${{ matrix.test_preamble }}
-          ctest --preset test-${{ matrix.linkage }}-${{ matrix.config }} --output-on-failure
+          ctest --preset test-ninja-${{ matrix.compiler }}-${{ matrix.linkage}}-${{ matrix.config }} --output-on-failure
diff --git a/dev/ci-pre-configure b/dev/ci-pre-configure
@@ -2,4 +2,4 @@
 
 wget https://apt.llvm.org/llvm.sh
 chmod +x llvm.sh
-sudo ./llvm.sh $0
+sudo ./llvm.sh $1