Merge branch 'develop' into ci/compiler-warnings

LLNL · May 16, 2024 · e44af52 · e44af52
2 parents c87410c + 9ebc406
commit e44af52
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 116 deletions.
diff --git a/.github/workflows/extended-precision.yml b/.github/workflows/extended-precision.yml
diff --git a/.github/workflows/single-precision.yml b/.github/workflows/single-precision.yml
diff --git a/.github/workflows/double-precision.yml → .github/workflows/ubuntu-latest.yml b/.github/workflows/double-precision.yml → .github/workflows/ubuntu-latest.yml
@@ -1,5 +1,5 @@
 #
-name: Build and Test - Ubuntu/gcc double precision (TPLs, no GPUs)
+name: Build and Test - Ubuntu/gcc (TPLs, no GPUs)
 
 on:
   push:
@@ -24,8 +24,21 @@ jobs:
       max-parallel: 2
       matrix:
         indexsize: [32, 64]
-        precision: ['double']
-        buildtype: ['Debug', 'Release']
+        # Disable extended tests until compiler warnings are addressed
+        precision: ['single', 'double']
+        buildtype: ['Debug', 'Release', 'RelWithDebInfo']
+        exclude:
+          - buildtype: Debug
+            precision: single
+          # - buildtype: Debug
+          #   precision: extended
+          - buildtype: Release
+            precision: single
+          # - buildtype: Release
+          #   precision: extended
+          - buildtype: RelWithDebInfo
+            precision: double
+
     steps:
       - name: Checkout repository
         uses: actions/checkout@v3

diff --git a/.github/workflows/windows-latest-mingw.yml b/.github/workflows/windows-latest-mingw.yml
@@ -14,27 +14,46 @@ env:
   BUILD_TYPE: Release
 
 jobs:
-  buil_and_test:
+  build_and_test:
     runs-on: windows-latest
 
+    defaults:
+      run:
+        # Use MSYS2 as default shell
+        shell: msys2 {0}
+
     steps:
     - uses: actions/checkout@v3
 
     - uses: msys2/setup-msys2@v2
       with:
         msystem: mingw64
+        update: true
+        release: false
+        install: >-
+            base-devel
+            mingw-w64-x86_64-cmake
+            mingw-w64-x86_64-cc
+            mingw-w64-x86_64-openblas
+            mingw-w64-x86_64-suitesparse
 
     - name: Configure CMake
-      # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
-      # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
-      run: cmake -G "MinGW Makefiles" -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DSUNDIALS_BUILD_WITH_PROFILING=ON -DSUNDIALS_LOGGING_LEVEL=2 -DSUNDIALS_TEST_UNITTESTS=OFF -DEXAMPLES_ENABLE_CXX=ON
+      # Configure CMake in a 'build' subdirectory
+      run: |
+        cmake \
+          -B ${GITHUB_WORKSPACE}/build \
+          -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} \
+          -DSUNDIALS_BUILD_WITH_PROFILING=ON \
+          -DSUNDIALS_LOGGING_LEVEL=2 \
+          -DSUNDIALS_TEST_UNITTESTS=OFF \
+          -DEXAMPLES_ENABLE_CXX=ON \
+          -DENABLE_KLU=ON
 
     - name: Build
-      # Build your program with the given configuration
-      run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
+      # Build your program
+      run: cmake --build ${GITHUB_WORKSPACE}/build
 
     - name: Test
       working-directory: ${{github.workspace}}/build
-      # Execute tests defined by the CMake configuration.
-      # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
-      run: ctest -C ${{env.BUILD_TYPE}}
+      # Execute tests
+      run: ctest