Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Double Down to 1.1.0 #932

Closed
wants to merge 3 commits into from
Closed

Update Double Down to 1.1.0 #932

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
50625d4
dd 1.1.0
ahnaf-tahmid-chowdhury Dec 20, 2023
21ed3d1
DOUBLE_DOWN_VERSION=v1.1.0
ahnaf-tahmid-chowdhury Dec 20, 2023
1dc23d6
Merge branch 'develop' into dd-version
ahnaf-tahmid-chowdhury Dec 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/actions/upstream-test/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: v1.1.0

runs:
using: "composite"
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/docker_publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ jobs:
moab_versions : [
5.3.0,
]
double_down : [
OFF,
double_down_version : [
v1.1.0,
]
geant_version : [
10.7.4,
Expand Down Expand Up @@ -90,8 +90,8 @@ jobs:
moab_versions : [
5.3.0,
]
double_down : [
OFF,
double_down_version : [
1.1.0,
]
geant_version : [
10.7.4,
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/linux_build_test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
moab_versions : [
5.3.0,
]
double_down : [
double_down_version : [
OFF,
]
geant_version : [
Expand Down Expand Up @@ -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 && \
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/linux_upstream_test_double_down.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,4 @@ jobs:
uses: ./.github/actions/upstream-test
with:
token: ${{ secrets.GITHUB_TOKEN }}
double_down: ON


double_down_version: v1.1.0
6 changes: 4 additions & 2 deletions CI/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=v1.1.0
ARG ci_jobs=4
ARG HDF5_VERSION=1.14.3

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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} \
Expand Down
Loading