diff --git a/.github/actions/upstream-test/action.yml b/.github/actions/upstream-test/action.yml index 728382688..87aa5e1e8 100644 --- a/.github/actions/upstream-test/action.yml +++ b/.github/actions/upstream-test/action.yml @@ -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" diff --git a/.github/workflows/docker_publish.yml b/.github/workflows/docker_publish.yml index be4d8b42b..8f8db3455 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, ] geant4_version : [ 10.7.4, @@ -91,7 +91,7 @@ jobs: 5.3.0, ] double_down_version : [ - 1.1.0, + v1.1.0, ] geant4_version : [ 10.7.4, diff --git a/.github/workflows/linux_build_test.yml b/.github/workflows/linux_build_test.yml index 77d19e6bf..84c71875c 100644 --- a/.github/workflows/linux_build_test.yml +++ b/.github/workflows/linux_build_test.yml @@ -43,7 +43,7 @@ jobs: compiler : [ gcc, clang, - ] + ] hdf5_version : [ 1.10.4, ] diff --git a/CI/Dockerfile b/CI/Dockerfile index 0574edffc..467aa74ad 100644 --- a/CI/Dockerfile +++ b/CI/Dockerfile @@ -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 @@ -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 \ @@ -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} \