Update ci script to use latest os versions. (#774)

libocca · Nov 20, 2024 · 6c2e7d3 · 6c2e7d3
1 parent 9ab654f
commit 6c2e7d3
Showing 1 changed file with 17 additions and 32 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -17,41 +17,34 @@ jobs:
     strategy:
       matrix:
         include:
-          - name: "[Ubuntu] gcc-12"
-            os: ubuntu-22.04
-            CC: gcc-12
-            CXX: g++-12
+          - name: "[Ubuntu] gcc"
+            os: ubuntu-latest
+            CC: gcc
+            CXX: g++
             CXXFLAGS: -Wno-maybe-uninitialized
-            FC: gfortran-12
-            GCOV: gcov-12
+            FC: gfortran
+            GCOV: gcov
             OCCA_COVERAGE: 1
             OCCA_FORTRAN_ENABLED: 1
 
-          - name: "[Ubuntu] CMake + gcc-12"
-            os: ubuntu-22.04
-            CC: gcc-12
-            CXX: g++-12
+          - name: "[Ubuntu] CMake + gcc"
+            os: ubuntu-latest
+            CC: gcc
+            CXX: g++
             CXXFLAGS: -Wno-maybe-uninitialized -Wno-cpp
-            FC: gfortran-12
+            FC: gfortran
             OCCA_FORTRAN_ENABLED: 1
             useCMake: true
 
-          - name: "[Ubuntu] clang-14"
-            os: ubuntu-22.04
-            CC: clang-14
-            CXX: clang++-14
-            CXXFLAGS: -Wno-uninitialized
-            OCCA_COVERAGE: 0
-
-          - name: "[Ubuntu] clang-13"
-            os: ubuntu-22.04
-            CC: clang-13
-            CXX: clang++-13
+          - name: "[Ubuntu] CMake + clang"
+            os: ubuntu-latest
+            CC: clang
+            CXX: clang++
             CXXFLAGS: -Wno-uninitialized
-            OCCA_COVERAGE: 0
+            useCMake: true
 
           - name: "[Ubuntu] CMake + Intel/LLVM"
-            os: ubuntu-22.04
+            os: ubuntu-latest
             CC: icx
             CXX: icpx
             CXXFLAGS: -Wno-uninitialized
@@ -61,12 +54,6 @@ jobs:
             useCMake: true
             useoneAPI: true
 
-          - name: "[MacOS] clang"
-            os: macos-12
-            CC: clang
-            CXX: clang++
-            CXXFLAGS: -Wno-uninitialized
-
     runs-on: ${{ matrix.os }}
     name: ${{ matrix.name }}
 
@@ -171,8 +158,6 @@ jobs:
       run: |
         ctest --test-dir build --progress --output-on-failure --parallel 8 --schedule-random -E "examples_cpp_arrays-opencl|examples_cpp_for_loops-opencl|examples_cpp_generic_inline_kernel-opencl|examples_cpp_shared_memory-opencl|examples_cpp_nonblocking_streams-opencl|examples_cpp_for_loops-dpcpp|examples_cpp_arrays-dpcpp|examples_cpp_generic_inline_kernel-dpcpp|examples_cpp_nonblocking_streams-dpcpp"
 
-        
-
     - name: Run CTests
       if: ${{ matrix.useCMake && matrix.useoneAPI }}
       env: