From 50625d4c1c06b804f3f74e65fe75616dda8ccc12 Mon Sep 17 00:00:00 2001 From: Ahnaf Tahmid Chowdhury Date: Wed, 20 Dec 2023 23:01:44 +0600 Subject: [PATCH 1/2] dd 1.1.0 --- .github/actions/upstream-test/action.yml | 4 ++-- .github/workflows/docker_publish.yml | 20 +++++++++---------- .github/workflows/linux_build_test.yml | 6 +++--- .../linux_upstream_test_double_down.yml | 4 +--- CI/Dockerfile | 6 ++++-- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.github/actions/upstream-test/action.yml b/.github/actions/upstream-test/action.yml index 68064d160..e9f7e3d97 100644 --- a/.github/actions/upstream-test/action.yml +++ b/.github/actions/upstream-test/action.yml @@ -25,10 +25,10 @@ inputs: description: Version of MOAB required: false default: 5.3.0 - double_down: + double_down_version: description: Whether or not to test Double Down required: false - default: OFF + default: 1.1.0 runs: using: "composite" diff --git a/.github/workflows/docker_publish.yml b/.github/workflows/docker_publish.yml index 902a9703f..323e00dd9 100644 --- a/.github/workflows/docker_publish.yml +++ b/.github/workflows/docker_publish.yml @@ -17,19 +17,19 @@ jobs: ubuntu_versions : [ 20.04, 22.04, - ] + ] compiler : [ gcc, clang, - ] + ] hdf5_versions : [ 1.10.4, ] moab_versions : [ 5.3.0, ] - double_down : [ - OFF, + double_down_version : [ + 1.1.0, ] geant_version : [ 10.7.4, @@ -79,19 +79,19 @@ jobs: ubuntu_versions : [ 20.04, 22.04, - ] + ] compiler : [ gcc, clang, - ] + ] hdf5_versions : [ - 1.10.4, + 1.10.4, ] moab_versions : [ - 5.3.0, + 5.3.0, ] - double_down : [ - OFF, + double_down_version : [ + 1.1.0, ] geant_version : [ 10.7.4, diff --git a/.github/workflows/linux_build_test.yml b/.github/workflows/linux_build_test.yml index 0e866db73..72b8d922f 100644 --- a/.github/workflows/linux_build_test.yml +++ b/.github/workflows/linux_build_test.yml @@ -45,12 +45,12 @@ jobs: clang, ] hdf5_versions : [ - 1.10.4, + 1.10.4, ] moab_versions : [ 5.3.0, ] - double_down : [ + double_down_version : [ OFF, ] geant_version : [ @@ -84,7 +84,7 @@ jobs: -DCMAKE_CXX_COMPILER=${CXX} \ -DCMAKE_Fortran_COMPILER=gfortran \ -DCMAKE_INSTALL_PREFIX=${install_dir}/dagmc \ - -DDOUBLE_DOWN=${double_down} \ + -DDOUBLE_DOWN=${{ matrix.double_down_version != 'OFF' && 'ON' || 'OFF' }} \ -DCMAKE_CXX_FLAGS="-Werror=reorder" \ -Ddd_ROOT=${double_down_install_dir} && \ make -j2 && \ diff --git a/.github/workflows/linux_upstream_test_double_down.yml b/.github/workflows/linux_upstream_test_double_down.yml index b23332db7..6da13d2eb 100644 --- a/.github/workflows/linux_upstream_test_double_down.yml +++ b/.github/workflows/linux_upstream_test_double_down.yml @@ -27,6 +27,4 @@ jobs: uses: ./.github/actions/upstream-test with: token: ${{ secrets.GITHUB_TOKEN }} - double_down: ON - - + double_down_version: 1.1.0 diff --git a/CI/Dockerfile b/CI/Dockerfile index 434d43a76..74204be61 100644 --- a/CI/Dockerfile +++ b/CI/Dockerfile @@ -8,7 +8,8 @@ ARG EMBREE_BRANCH='v3.6.1' ARG geant4_version=11.1.2 ARG UBUNTU_VERSION=20.04 ARG MOAB_BRANCH=5.3.0 -ARG double_down=OFF +ARG double_down=ON +ARG DOUBLE_DOWN_VERSION=1.1.0 ARG ci_jobs=4 ARG HDF5_VERSION=1.10.4 @@ -156,6 +157,7 @@ FROM hdf5 AS moab # accessing gloabl ARGs in build stage ARG install_dir ARG MOAB_BRANCH +ARG DOUBLE_DOWN_VERSION ARG build_dir ARG ci_jobs ARG CXX @@ -193,7 +195,7 @@ ENV double_down_install_dir=${install_dir}/double-down # performed after moab install as double-down requires moab RUN mkdir -p ${double_down_build_dir}/build && \ cd ${double_down_build_dir} && \ - git clone --shallow-submodules --single-branch --branch v1.0.0 --depth 1 https://github.com/pshriwise/double-down.git && \ + git clone --shallow-submodules --single-branch --branch $DOUBLE_DOWN_VERSION --depth 1 https://github.com/pshriwise/double-down.git && \ cd build && \ cmake ../double-down -DMOAB_DIR=${moab_install_dir} \ -DCMAKE_INSTALL_PREFIX=${double_down_install_dir} \ From 21ed3d1bc850471772eab929b7a0521289dca8f5 Mon Sep 17 00:00:00 2001 From: Ahnaf Tahmid Chowdhury Date: Wed, 20 Dec 2023 23:11:04 +0600 Subject: [PATCH 2/2] DOUBLE_DOWN_VERSION=v1.1.0 --- .github/actions/upstream-test/action.yml | 2 +- .github/workflows/docker_publish.yml | 2 +- .github/workflows/linux_upstream_test_double_down.yml | 2 +- CI/Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/actions/upstream-test/action.yml b/.github/actions/upstream-test/action.yml index e9f7e3d97..eae94578d 100644 --- a/.github/actions/upstream-test/action.yml +++ b/.github/actions/upstream-test/action.yml @@ -28,7 +28,7 @@ inputs: double_down_version: description: Whether or not to test Double Down required: false - default: 1.1.0 + default: v1.1.0 runs: using: "composite" diff --git a/.github/workflows/docker_publish.yml b/.github/workflows/docker_publish.yml index 323e00dd9..bae8a638d 100644 --- a/.github/workflows/docker_publish.yml +++ b/.github/workflows/docker_publish.yml @@ -29,7 +29,7 @@ jobs: 5.3.0, ] double_down_version : [ - 1.1.0, + v1.1.0, ] geant_version : [ 10.7.4, diff --git a/.github/workflows/linux_upstream_test_double_down.yml b/.github/workflows/linux_upstream_test_double_down.yml index 6da13d2eb..6915165dd 100644 --- a/.github/workflows/linux_upstream_test_double_down.yml +++ b/.github/workflows/linux_upstream_test_double_down.yml @@ -27,4 +27,4 @@ jobs: uses: ./.github/actions/upstream-test with: token: ${{ secrets.GITHUB_TOKEN }} - double_down_version: 1.1.0 + double_down_version: v1.1.0 diff --git a/CI/Dockerfile b/CI/Dockerfile index 74204be61..307905255 100644 --- a/CI/Dockerfile +++ b/CI/Dockerfile @@ -9,7 +9,7 @@ ARG geant4_version=11.1.2 ARG UBUNTU_VERSION=20.04 ARG MOAB_BRANCH=5.3.0 ARG double_down=ON -ARG DOUBLE_DOWN_VERSION=1.1.0 +ARG DOUBLE_DOWN_VERSION=v1.1.0 ARG ci_jobs=4 ARG HDF5_VERSION=1.10.4