Update workflows

fintarin · Sep 22, 2023 · 0bca94a · 0bca94a
1 parent 57064bb
commit 0bca94a
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -23,8 +23,9 @@ jobs:
         config:
           - { name: Ubuntu GCC, os: ubuntu-latest, cc: gcc, cxx: g++ }
           - { name: Ubuntu Clang, os: ubuntu-latest, cc: clang, cxx: clang++ }
-          - { name: macOS GCC, os: macOS-latest, cc: gcc, cxx: g++ }
-          - { name: macOS Clang, os: macOS-latest, cc: clang, cxx: clang++ }
+          # TODO: remove version specifiers after macOS-latest upgrades to version 13
+          - { name: macOS GCC, os: macOS-13, cc: gcc, cxx: g++ }
+          - { name: macOS Clang, os: macOS-13, cc: clang, cxx: clang++ }
           - { name: Windows GCC, os: windows-latest, cc: gcc, cxx: g++ }
           - { name: Windows Clang, os: windows-latest, cc: clang, cxx: clang++ }
           - { name: Windows MSVC, os: windows-latest, cc: msvc, cxx: msvc }
@@ -33,6 +34,13 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
 
+      # TODO: remove this step after the default Clang is updated to version 16
+      - name: Install LLVM and Clang
+        if: matrix.config.os == 'ubuntu-latest'
+        uses: KyleMayes/install-llvm-action@v1
+        with:
+          version: "16.0"
+
       - name: Configure CMake
         working-directory: ${{github.workspace}}
         run: cmake -Bbuild -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -Dfintamath_build_tests=ON -Dfintamath_build_shared=ON -Dfintamath_warnings_as_errors=ON

diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -28,6 +28,12 @@ jobs:
           sudo apt-get update
           sudo apt-get install llvm lcov
 
+      # TODO: remove this step after the default Clang is updated to version 16
+      - name: Install LLVM and Clang
+        uses: KyleMayes/install-llvm-action@v1
+        with:
+          version: "16.0"
+
       - name: Configure CMake
         working-directory: ${{github.workspace}}
         run: cmake -Bbuild -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -Dfintamath_build_tests=ON -Dfintamath_enable_coverage=ON