Another Round of CI tweaks

Exawind · Jul 10, 2024 · b31d6ef · b31d6ef
1 parent 9ec4555
commit b31d6ef
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 181 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
diff --git a/.github/workflows/clang-tidy.yaml b/.github/workflows/clang-tidy.yaml
@@ -6,7 +6,7 @@ env:
   CMAKE_BUILD_PARALLEL_LEVEL: 1
 
 jobs:
-  Correctness:
+  ClangTidy:
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
@@ -32,7 +32,6 @@ jobs:
         submodules: true
         path: openturbine
     - name: Run Clang-Tidy
-      if: matrix.os == 'ubuntu-latest' && matrix.compiler == 'llvm'
       run: |
         source spack/share/spack/setup-env.sh
         spack load trilinos
@@ -43,6 +42,6 @@ jobs:
         cmake .. \
           -DOTURB_ENABLE_TESTS:BOOL=ON \
           -DOTURB_ENABLE_BASIC_SANITIZERS=ON \
-          -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} \
+          -DCMAKE_BUILD_TYPE=Debug \
           -DCMAKE_CXX_CLANG_TIDY="clang-tidy"
         cmake --build .
diff --git a/.github/workflows/correctness.yaml b/.github/workflows/correctness.yaml
@@ -2,27 +2,19 @@ name: OpenTurbine-CI
 
 on: push
 
-env:
-  CMAKE_BUILD_PARALLEL_LEVEL: 4
-  CTEST_PARALLEL_LEVEL: 2
-
 jobs:
-  Correctness:
+  CTest:
     runs-on: ${{matrix.os}}
+    env:
+      CMAKE_BUILD_PARALLEL_LEVEL: 4
+      CTEST_PARALLEL_LEVEL: 2
+      CXX: ${{matrix.compiler}}
     strategy:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest]
-        compiler: [gcc, llvm]
+        compiler: [g++, clang++]
         build_type: [Release, Debug]
-        exclude: 
-          - os: macos-latest
-            compiler: gcc
-        include:
-           - os: ubuntu-latest
-             install_deps: sudo apt-get install gfortran-13 libblas-dev liblapack-dev liblapacke-dev
-           - os: macos-latest
-             install_deps: brew install gfortran gcc openblas lapack
     steps:
     - name: Cache install Trilinos
       id: cache-trilinos

diff --git a/.github/workflows/cppcheck.yaml b/.github/workflows/cppcheck.yaml
@@ -6,7 +6,7 @@ env:
   CMAKE_BUILD_PARALLEL_LEVEL: 1
 
 jobs:
-  Correctness:
+  CppCheck:
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
@@ -32,7 +32,6 @@ jobs:
         submodules: true
         path: openturbine
     - name: Run CppCheck
-      if: matrix.os == 'ubuntu-latest' && matrix.compiler == 'llvm'
       run: |
         source spack/share/spack/setup-env.sh
         spack load trilinos
@@ -43,6 +42,6 @@ jobs:
         cmake .. \
           -DOTURB_ENABLE_TESTS:BOOL=ON \
           -DOTURB_ENABLE_BASIC_SANITIZERS=ON \
-          -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} \
+          -DCMAKE_BUILD_TYPE=Debug \
           -DCMAKE_CXX_CPPCHECK="cppcheck;--enable=all;--error-exitcode=0;--suppress=missingInclude;--library=googletest"
         cmake --build .
diff --git a/.github/workflows/deploy-pages.yaml b/.github/workflows/deploy-pages.yaml
diff --git a/.github/workflows/formatting.yaml b/.github/workflows/formatting.yaml
@@ -3,7 +3,7 @@ name: OpenTurbine-CI
 on: push
 
 jobs:
-  Formatting:
+  ClangFormat:
     runs-on: ubuntu-latest
     steps:
     - name: Clone
@@ -13,5 +13,5 @@ jobs:
       with:
         source: './src ./tests/unit_tests'
         exclude: '.'
-        extensions: 'H,h,cpp'
+        extensions: 'H,h,cpp,hpp'
         clangFormatVersion: 16