Skip to content

Commit

Permalink
fix DOUBLE_DOWN_VERSION branch for develop
Browse files Browse the repository at this point in the history
  • Loading branch information
ahnaf-tahmid-chowdhury committed Dec 9, 2023
1 parent b9c88b6 commit 26ad7e3
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/actions/upstream-test/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ inputs:
double_down_version:
description: Version of Double Down
required: false
default: 1.1.0
default: v1.1.0

runs:
using: "composite"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/docker_publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
5.3.0,
]
double_down_version : [
1.1.0,
v1.1.0,
]
geant4_version : [
10.7.4,
Expand Down Expand Up @@ -91,7 +91,7 @@ jobs:
5.3.0,
]
double_down_version : [
1.1.0,
v1.1.0,
]
geant4_version : [
10.7.4,
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/linux_build_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
compiler : [
gcc,
clang,
]
]
hdf5_version : [
1.10.4,
]
Expand Down
8 changes: 4 additions & 4 deletions CI/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
# Global ARGS set before the first build stage are accessable by all build stages
ARG UBUNTU_VERSION=22.04
ARG HDF5_VERSION=1.10.4
ARG EMBREE_VERSION=4.0.1
ARG EMBREE_VERSION=v4.0.1
ARG Geant4_VERSION=11.1.2
ARG MOAB_VERSION=5.3.0
ARG DOUBLE_DOWN_VERSION=1.1.0
ARG DOUBLE_DOWN_VERSION=v1.1.0
ARG CI_JOBS=4

ARG build_dir=/root/build_dir
Expand Down Expand Up @@ -107,7 +107,7 @@ ENV embree_build_dir=${build_dir}/embree
# Clone and install Embree
RUN mkdir -p ${embree_build_dir}/build && \
cd ${embree_build_dir} && \
git clone -b v${EMBREE_VERSION} https://github.com/embree/embree && \
git clone -b ${EMBREE_VERSION} https://github.com/embree/embree && \
cd build && \
cmake ../embree -DCMAKE_INSTALL_PREFIX=${embree_install_dir} \
-DEMBREE_TASKING_SYSTEM=INTERNAL \
Expand Down Expand Up @@ -193,7 +193,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 v${DOUBLE_DOWN_VERSION} --depth 1 https://github.com/pshriwise/double-down.git && \
git clone -b ${DOUBLE_DOWN_VERSION} --depth 1 https://github.com/pshriwise/double-down.git && \
cd build && \
cmake ../double-down \
-DMOAB_DIR=${moab_install_dir} \
Expand Down

0 comments on commit 26ad7e3

Please sign in to comment.