diff --git a/.github/actions/upstream-test/action.yml b/.github/actions/upstream-test/action.yml index 8aa874092..26802f269 100644 --- a/.github/actions/upstream-test/action.yml +++ b/.github/actions/upstream-test/action.yml @@ -44,13 +44,21 @@ 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 }} + 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 server-stage: dagmc_test quiet: false diff --git a/.github/workflows/docker_publish.yml b/.github/workflows/docker_publish.yml index 64b2b6313..2a23b7c4a 100644 --- 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 diff --git a/.github/workflows/linux_build_test.yml b/.github/workflows/linux_build_test.yml index e58aa9f82..383a2fd19 100644 --- 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,7 +36,7 @@ jobs: strategy: matrix: - ubuntu_versions : [ + ubuntu_version : [ 20.04, 22.04, ] @@ -44,23 +44,36 @@ jobs: 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 +83,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 +98,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 \ No newline at end of file diff --git a/doc/CHANGELOG.rst b/doc/CHANGELOG.rst index 5ee6d4609..ab2d8cf1d 100644 --- a/doc/CHANGELOG.rst +++ b/doc/CHANGELOG.rst @@ -14,7 +14,7 @@ Next version * Update MOAB to 5.5.1 from 5.3.0 (#939 #940) * Update README regarding OpenMC (#938) * Simplify Housekeeping Process for DAGMC (#943) - * Allow Double Down v1.1.0 Installation in Dockerfile (#929 #944) + * Allow Double Down v1.1.0 Installation in Dockerfile (#929 #944 #949) * Inline documentation improvements (#945) v3.2.3