Merge pull request #81 from sandialabs/ci_updates

Ci updates

Author: Matthew-Whitlock

.github/docker-compose.yml

@@ -3,11 +3,12 @@ services:
     image: "bootstrap"
     build:
       dockerfile_inline: |
-        FROM spack/ubuntu-jammy:0.22.2
+        FROM spack/ubuntu-jammy:0.23
         VOLUME /configs
         ARG OMPI_VERSION
         ENV OMPI_VERSION=$${OMPI_VERSION}
         CMD cp /configs/spack.yaml . && \
+            export OMPI_VERSION=$( [[ "$${OMPI_VERSION}" == git.* ]] && echo "$${OMPI_VERSION}=main" || echo "$${OMPI_VERSION}" ) && \
             spack -e . add openmpi@$${OMPI_VERSION} && \
             spack -e . containerize >/configs/spack.Dockerfile
       args:
@@ -36,8 +37,8 @@ services:
             cmake /fenix \
                 -DCMAKE_BUILD_TYPE=Release \
                 -DCMAKE_C_COMPILER=mpicc \
-                -DFENIX_EXAMPLES=ON \
-                -DFENIX_TESTS=ON \
+                -DBUILD_EXAMPLES=ON \
+                -DBUILD_TESTING=ON \
                 -DMPIEXEC_PREFLAGS="--allow-run-as-root;--map-by;:oversubscribe" && \
             make -j
         

.github/workflows/ci_checks.yaml

@@ -12,6 +12,9 @@ jobs:
         ompi_version:
           - main
           - 5.0.3
+          - git.v5.0.5
+          - git.v5.0.7
+          - git.v5.0.x
 
     steps:
       - name: Checkout
@@ -37,4 +40,4 @@ jobs:
             *.args.OMPI_VERSION=${{ matrix.ompi_version }}
 
       - name: Test Fenix
-        run: docker run fenix
+        run: docker run fenix ctest --output-on-failure --timeout 20 --repeat after-timeout:3