diff --git a/.github/actions/upstream-test/action.yml b/.github/actions/upstream-test/action.yml index 92b826f57..728382688 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: develop + default: 1.1.0 runs: using: "composite" diff --git a/.github/workflows/docker_publish.yml b/.github/workflows/docker_publish.yml index bd04a21b8..5c95b41a7 100644 --- a/.github/workflows/docker_publish.yml +++ b/.github/workflows/docker_publish.yml @@ -29,7 +29,7 @@ jobs: 5.3.0, ] double_down_version : [ - develop, + 1.1.0, ] geant4_version : [ 10.7.4, @@ -91,7 +91,7 @@ jobs: 5.3.0, ] double_down_version : [ - develop, + 1.1.0, ] geant4_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 d7a7bdc70..08c336106 100644 --- a/.github/workflows/linux_upstream_test_double_down.yml +++ b/.github/workflows/linux_upstream_test_double_down.yml @@ -1,4 +1,4 @@ -name: Test against Double Down on PR merge +name: Test against newer Double Down on PR merge on: # allows us to run workflows manually diff --git a/.github/workflows/linux_upstream_test_moab.yml b/.github/workflows/linux_upstream_test_moab.yml index 4e6df8faf..640201289 100644 --- a/.github/workflows/linux_upstream_test_moab.yml +++ b/.github/workflows/linux_upstream_test_moab.yml @@ -1,4 +1,4 @@ -name: Test against MOAB master on PR merge +name: Test against newer MOAB on PR merge on: # allows us to run workflows manually diff --git a/CI/Dockerfile b/CI/Dockerfile index b8f8d3e43..35080e273 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='v3.6.1' +ARG EMBREE_VERSION='v4.0.1' ARG Geant4_VERSION=11.1.2 ARG MOAB_VERSION=5.3.0 -ARG DOUBLE_DOWN_VERSION='develop' +ARG DOUBLE_DOWN_VERSION=1.1.0 ARG CI_JOBS=4 ARG build_dir=/root/build_dir