move test into github actions

NCAR · Sep 13, 2024 · 52cb2dd · 52cb2dd
1 parent b3f5099
commit 52cb2dd
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 101 deletions.
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -21,8 +21,6 @@ jobs:
         os: [ubuntu-latest]
         dockerfile:
           - Dockerfile
-          - Dockerfile.micm-only
-          - Dockerfile.tuvx-only
           - Dockerfile.memcheck
           - Dockerfile.fortran-gcc
           - Dockerfile.openmp

diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
@@ -23,6 +23,8 @@ jobs:
           - { cpp: g++-14, c: gcc-14, fc: gfortran-14}
           - { cpp: clang++, c: clang, fc: gfortran-12}
         options: 
+          - {micm: ON, tuvx: OFF}
+          - {micm: OFF, tuvx: ON}
           - {python: ON, tuvx: OFF}
           - {python: OFF, tuvx: ON}
         build_type: [Release]
@@ -41,7 +43,12 @@ jobs:
           sudo apt-get install -y python3-numpy
 
       - name: Run Cmake 
-        run: cmake -S . -B build -D CMAKE_BUILD_TYPE=${{ matrix.build_type }} -D MUSICA_GIT_TAG=${{ github.sha }} -D MUSICA_ENABLE_PYTHON_LIBRARY=${{ matrix.options.python }} -D MUSICA_ENABLE_TUVX=${{ matrix.matrix.options.tuvx }}
+        run: >
+          cmake -S . -B build -D CMAKE_BUILD_TYPE=${{ matrix.build_type }}
+                              -D MUSICA_GIT_TAG=${{ github.sha }}
+                              -D MUSICA_ENABLE_MICM=${{ matrix.options.micm }}
+                              -D MUSICA_ENABLE_TUVX=${{ matrix.options.tuvx }}
+                              -D MUSICA_ENABLE_PYTHON_LIBRARY=${{ matrix.options.python }}
 
       - name: Build
         run: cmake --build build --verbose

diff --git a/docker/Dockerfile.micm-only b/docker/Dockerfile.micm-only
diff --git a/docker/Dockerfile.tuvx-only b/docker/Dockerfile.tuvx-only