Merge branch 'develop' into rtd

svalinn · Apr 25, 2024 · eec1b77 · eec1b77
2 parents d5cf2a4 + 7e1cdb6
commit eec1b77
Show file tree

Hide file tree

Showing 9 changed files with 204 additions and 177 deletions.
diff --git a/.github/actions/upstream-test/action.yml b/.github/actions/upstream-test/action.yml
@@ -20,11 +20,11 @@ inputs:
   hdf5_version:
     description: Version of HDF5
     required: false
-    default: 1.14.3
+    default: hdf5_1_14_3
   moab_version:
     description: Version of MOAB
     required: false
-    default: 5.3.0
+    default: 5.5.1
   double_down_version:
     description: Version of Double Down
     required: false
@@ -44,14 +44,22 @@ runs:
         uses: firehed/multistage-docker-build-action@v1
         with:
           repository: >
-            ghcr.io/${{ github.repository_owner }}/
-            dagmc-ci-ubuntu-${{ inputs.ubuntu_version }}
-            -${{ inputs.compiler}}
-            -hdf5_${{ inputs.hdf5_version}}
-            -moab_${{ inputs.moab_version }}
-            -geant4_${{ inputs.geant4_version }}
-            -double_down_${{ inputs.double_down_version }}
-          stages: base, external_deps, hdf5, moab, dagmc
+            ghcr.io/${{
+              github.repository_owner
+            }}/dagmc-ci-ubuntu-${{
+              inputs.ubuntu_version
+            }}-${{
+              inputs.compiler
+            }}-hdf5_${{
+              inputs.hdf5_version
+            }}-moab_${{
+              inputs.moab_version
+            }}-geant4_${{
+              inputs.geant4_version
+            }}-double_down_${{
+              inputs.double_down_version
+            }}
+          stages: base, external_deps, dagmc
           server-stage: dagmc_test
           quiet: false
           parallel: true

diff --git a/.github/workflows/docker_publish.yml b/.github/workflows/docker_publish.yml
@@ -1,4 +1,4 @@
-name: Build & Publish docker image for DAGMC-CI
+name: Build & Publish docker image
 
 on:
   # allows us to run workflows manually
@@ -15,23 +15,23 @@ jobs:
     strategy:
       matrix:
         ubuntu_version : [
-          20.04,
           22.04,
         ]
         compiler : [
           gcc,
           clang,
         ]
         hdf5_version : [
-          1.14.3,
+          hdf5_1_14_3,
         ]
         moab_version : [
           5.4.1,
           5.5.1,
         ]
         geant4_version : [
-          10.7.4,
-          11.1.2
+          off,
+          v10.7.4,
+          v11.2.1,
         ]
         double_down_version : [
           off,
@@ -74,7 +74,7 @@ jobs:
         uses: firehed/multistage-docker-build-action@v1
         with:
           repository: ${{ env.image_base_tag }}
-          stages: base, external_deps, hdf5, moab, dagmc
+          stages: base, external_deps, dagmc, final
           server-stage: dagmc_test
           quiet: false
           parallel: true
@@ -96,23 +96,23 @@ jobs:
     strategy:
       matrix:
         ubuntu_version : [
-          20.04,
           22.04,
         ]
         compiler : [
           gcc,
           clang,
         ]
         hdf5_version : [
-          1.14.3,
+          hdf5_1_14_3,
         ]
         moab_version : [
           5.4.1,
           5.5.1,
         ]
         geant4_version : [
-          10.7.4,
-          11.1.2
+          off,
+          v10.7.4,
+          v11.2.1,
         ]
         double_down_version : [
           off,

diff --git a/.github/workflows/linux_build_test.yml b/.github/workflows/linux_build_test.yml
@@ -1,4 +1,4 @@
-name: Linux Build/Test for PR and collaborator push
+name: Linux Build/Test
 
 on:
   # allows us to run workflows manually
@@ -36,31 +36,43 @@ jobs:
 
     strategy:
       matrix:
-        ubuntu_versions : [
-          20.04,
+        ubuntu_version : [
           22.04,
         ]
         compiler : [
           gcc,
           clang,
         ]
-        hdf5_versions : [
+        hdf5_version : [
           1.14.3,
         ]
-        moab_versions : [
+        moab_version : [
           5.4.1,
           5.5.1,
         ]
-        double_down : [
-          OFF,
-        ]
-        geant_version : [
+        geant4_version : [
           10.7.4,
           11.1.2
         ]
+        double_down_version : [
+          off,
+          v1.1.0,
+        ]
 
     container:
-      image: ghcr.io/svalinn/dagmc-ci-ubuntu-${{ matrix.ubuntu_versions }}-${{ matrix.compiler}}-geant4_${{ matrix.geant_version }}-hdf5_${{ matrix.hdf5_versions}}-moab_${{ matrix.moab_versions }}/moab:latest
+      image: ghcr.io/svalinn/dagmc-ci-ubuntu-${{
+                matrix.ubuntu_version
+              }}-${{
+                matrix.compiler
+              }}-hdf5_${{
+                matrix.hdf5_version
+              }}-moab_${{
+                matrix.moab_version
+              }}-geant4_${{
+                matrix.geant4_version
+              }}-double_down_${{
+                matrix.double_down_version
+              }}/moab:latest
 
     steps:
       - name: Checkout repository
@@ -70,12 +82,12 @@ jobs:
 
       - name: Building DAGMC
         run: |
-          ln -s $GITHUB_WORKSPACE /root/build_dir/DAGMC
-          mkdir -p ./build
-          cd ./build
-          git config --global --add safe.directory $GITHUB_WORKSPACE
-          cmake ../ -DMOAB_DIR=${moab_install_dir} \
-              -DBUILD_GEANT4=ON \
+          git config --global --add safe.directory ${GITHUB_WORKSPACE}
+          mkdir -p build
+          cd build
+          cmake ../ \
+              -DMOAB_DIR=${moab_install_dir} \
+              -DBUILD_GEANT4=$([ "${{ matrix.geant4_version }}" != "off" ] && echo "ON" || echo "OFF") \
               -DGEANT4_DIR=${geant4_install_dir} \
               -DBUILD_CI_TESTS=ON \
               -DBUILD_MW_REG_TESTS=OFF \
@@ -85,13 +97,12 @@ jobs:
               -DCMAKE_CXX_COMPILER=${CXX} \
               -DCMAKE_Fortran_COMPILER=gfortran \
               -DCMAKE_INSTALL_PREFIX=${install_dir}/dagmc \
-              -DDOUBLE_DOWN=${double_down} \
-              -DCMAKE_CXX_FLAGS="-Werror=reorder" \
-              -Ddd_ROOT=${double_down_install_dir} && \
-          make -j2 && \
+              -DDOUBLE_DOWN=$([ "${{ matrix.double_down_version }}" != "off" ] && echo "ON" || echo "OFF") \
+              -Ddd_ROOT=${double_down_install_dir}
+          make -j${CI_JOBS}
           make install
 
       - name: Testing DAGMC
         run: |
-          cd $GITHUB_WORKSPACE/build
+          cd ${GITHUB_WORKSPACE}/build
           PATH=${install_dir}/dagmc/bin:${PATH} CTEST_OUTPUT_ON_FAILURE=1 make test
diff --git a/.github/workflows/linux_upstream_test_geant4.yml b/.github/workflows/linux_upstream_test_geant4.yml
@@ -1,4 +1,4 @@
-name: Test against newer Geant4 on PR merge
+name: Test against Geant4 development branch (master) on PR merge
 
 on:
   # allows us to run workflows manually
@@ -27,4 +27,4 @@ jobs:
         uses: ./.github/actions/upstream-test
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
-          geant_version: 11.1.2
+          geant_version: master
diff --git a/.github/workflows/linux_upstream_test_hdf5.yml b/.github/workflows/linux_upstream_test_hdf5.yml
@@ -1,4 +1,4 @@
-name: Test against newer hdf5 on PR merge
+name: Test against HDF5 development branch on PR merge
 
 on:
   # allows us to run workflows manually
@@ -28,4 +28,4 @@ jobs:
         uses: ./.github/actions/upstream-test
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
-          hdf5_version: 1.14.3
+          hdf5_version: develop