#2121: Use build_root variable instead of CACHE

DARMA-tasking · Dec 19, 2023 · c30bb4b · c30bb4b
1 parent 5df3153
commit c30bb4b
Show file tree

Hide file tree

Showing 19 changed files with 25 additions and 24 deletions.
diff --git a/.env b/.env
@@ -8,8 +8,9 @@ COMPILER_TYPE=gnu
 PROXY=
 TOKEN=
 # Change this path to save the volume content on disk.
-CACHE=
+#CACHE=
+build_root=
 
-VOLUME="${ARCH}-ubuntu-${UBUNTU}-${HOST_COMPILER}-${COMPILER}-cache"
-TMP="${CACHE}${VOLUME}/"
-FULL_CACHE_PATH="${CACHE:+${TMP}}"
+#VOLUME="${ARCH}-ubuntu-${UBUNTU}-${HOST_COMPILER}-${COMPILER}-cache"
+#TMP="${CACHE}${VOLUME}/"
+#FULL_CACHE_PATH="${CACHE+${TMP}}"
diff --git a/ci/azure/azure-clang-10-ubuntu-mpich.yml b/ci/azure/azure-clang-10-ubuntu-mpich.yml
@@ -58,7 +58,7 @@ variables:
   TEST_LB_SCHEMA: 0
   CACHE: "$(Agent.TempDirectory)/cache/"
   cache_name: ubuntu-clang-10-cache
-  build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache/ubuntu-cpp"
+  build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache"
   TS: 0
   TS_YEAR: 0
   TS_MONTH: 0

diff --git a/ci/azure/azure-clang-11-ubuntu-mpich.yml b/ci/azure/azure-clang-11-ubuntu-mpich.yml
@@ -58,7 +58,7 @@ variables:
   TEST_LB_SCHEMA: 0
   CACHE: "$(Agent.TempDirectory)/cache/"
   cache_name: ubuntu-clang-11-cache
-  build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache/ubuntu-cpp"
+  build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache"
   TS: 0
   TS_YEAR: 0
   TS_MONTH: 0

diff --git a/ci/azure/azure-clang-12-ubuntu-mpich.yml b/ci/azure/azure-clang-12-ubuntu-mpich.yml
@@ -58,7 +58,7 @@ variables:
   TEST_LB_SCHEMA: 0
   CACHE: "$(Agent.TempDirectory)/cache/"
   cache_name: ubuntu-clang-12-cache
-  build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache/ubuntu-cpp"
+  build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache"
   TS: 0
   TS_YEAR: 0
   TS_MONTH: 0

diff --git a/ci/azure/azure-clang-13-ubuntu-mpich.yml b/ci/azure/azure-clang-13-ubuntu-mpich.yml
@@ -58,7 +58,7 @@ variables:
   TEST_LB_SCHEMA: 0
   CACHE: "$(Agent.TempDirectory)/cache/"
   cache_name: ubuntu-clang-13-cache
-  build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache/ubuntu-cpp"
+  build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache"
   TS: 0
   TS_YEAR: 0
   TS_MONTH: 0

diff --git a/ci/azure/azure-clang-14-ubuntu-mpich.yml b/ci/azure/azure-clang-14-ubuntu-mpich.yml
@@ -58,7 +58,7 @@ variables:
   TEST_LB_SCHEMA: 0
   CACHE: "$(Agent.TempDirectory)/cache/"
   cache_name: ubuntu-clang-14-cache
-  build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache/ubuntu-cpp"
+  build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache"
   TS: 0
   TS_YEAR: 0
   TS_MONTH: 0

diff --git a/ci/azure/azure-clang-9-ubuntu-mpich.yml b/ci/azure/azure-clang-9-ubuntu-mpich.yml
@@ -58,7 +58,7 @@ variables:
   TEST_LB_SCHEMA: 0
   CACHE: "$(Agent.TempDirectory)/cache/"
   cache_name: ubuntu-clang-9-cache
-  build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache/ubuntu-cpp"
+  build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache"
   TS: 0
   TS_YEAR: 0
   TS_MONTH: 0

diff --git a/ci/azure/azure-clang-alpine-mpich.yml b/ci/azure/azure-clang-alpine-mpich.yml
@@ -58,7 +58,7 @@ variables:
   TEST_LB_SCHEMA: 0
   CACHE: "$(Agent.TempDirectory)/cache/"
   cache_name: alpine-clang-13-cache
-  build_root: "$(CACHE)$(ARCH)-alpine-$(HOST_COMPILER)-$(COMPILER)-cache/alpine-cpp"
+  build_root: "$(CACHE)$(ARCH)-alpine-$(HOST_COMPILER)-$(COMPILER)-cache"
   TS: 0
   TS_YEAR: 0
   TS_MONTH: 0

diff --git a/ci/azure/azure-gcc-10-ubuntu-openmpi.yml b/ci/azure/azure-gcc-10-ubuntu-openmpi.yml
@@ -58,7 +58,7 @@ variables:
   TEST_LB_SCHEMA: 0
   CACHE: "$(Agent.TempDirectory)/cache/"
   cache_name: ubuntu-gcc-10-cache
-  build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache/ubuntu-cpp"
+  build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache"
   TS: 0
   TS_YEAR: 0
   TS_MONTH: 0

diff --git a/ci/azure/azure-gcc-11-ubuntu-mpich.yml b/ci/azure/azure-gcc-11-ubuntu-mpich.yml
@@ -58,7 +58,7 @@ variables:
   TEST_LB_SCHEMA: 0
   CACHE: "$(Agent.TempDirectory)/cache/"
   cache_name: ubuntu-gcc-11-cache
-  build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache/ubuntu-cpp"
+  build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache"
   TS: 0
   TS_YEAR: 0
   TS_MONTH: 0

diff --git a/ci/azure/azure-gcc-12-ubuntu-mpich.yml b/ci/azure/azure-gcc-12-ubuntu-mpich.yml
@@ -58,7 +58,7 @@ variables:
   TEST_LB_SCHEMA: 0
   CACHE: "$(Agent.TempDirectory)/cache/"
   cache_name: ubuntu-gcc-12-cache
-  build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache/ubuntu-cpp"
+  build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache"
   TS: 0
   TS_YEAR: 0
   TS_MONTH: 0

diff --git a/ci/azure/azure-gcc-8-ubuntu-mpich.yml b/ci/azure/azure-gcc-8-ubuntu-mpich.yml
@@ -58,7 +58,7 @@ variables:
   TEST_LB_SCHEMA: 0
   CACHE: "$(Agent.TempDirectory)/cache/"
   cache_name: ubuntu-gcc-8-cache
-  build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache/ubuntu-cpp"
+  build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache"
   TS: 0
   TS_YEAR: 0
   TS_MONTH: 0

diff --git a/ci/azure/azure-gcc-9-ubuntu-mpich.yml b/ci/azure/azure-gcc-9-ubuntu-mpich.yml
@@ -58,7 +58,7 @@ variables:
   TEST_LB_SCHEMA: 1
   CACHE: "$(Agent.TempDirectory)/cache/"
   cache_name: ubuntu-gcc-9-cache
-  build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache/ubuntu-cpp"
+  build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache"
   TS: 0
   TS_YEAR: 0
   TS_MONTH: 0

diff --git a/ci/azure/azure-intel-oneapi-icpc-ubuntu-mpich.yml b/ci/azure/azure-intel-oneapi-icpc-ubuntu-mpich.yml
@@ -58,7 +58,7 @@ variables:
   TEST_LB_SCHEMA: 0
   CACHE: "$(Agent.TempDirectory)/cache/"
   cache_name: ubuntu-intel-oneapi-icpc-cache
-  build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache/ubuntu-cpp"
+  build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache"
   TS: 0
   TS_YEAR: 0
   TS_MONTH: 0

diff --git a/ci/azure/azure-intel-oneapi-icpx-ubuntu-mpich.yml b/ci/azure/azure-intel-oneapi-icpx-ubuntu-mpich.yml
@@ -58,7 +58,7 @@ variables:
   TEST_LB_SCHEMA: 0
   CACHE: "$(Agent.TempDirectory)/cache/"
   cache_name: ubuntu-intel-oneapi-icpx-cache
-  build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache/ubuntu-cpp"
+  build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache"
   TS: 0
   TS_YEAR: 0
   TS_MONTH: 0

diff --git a/ci/azure/azure-nvidia-11-2-ubuntu-mpich.yml b/ci/azure/azure-nvidia-11-2-ubuntu-mpich.yml
@@ -58,7 +58,7 @@ variables:
   TEST_LB_SCHEMA: 0
   CACHE: "$(Agent.TempDirectory)/cache/"
   cache_name: ubuntu-nvidia-11.2-cache
-  build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache/ubuntu-cpp"
+  build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache"
   TS: 0
   TS_YEAR: 0
   TS_MONTH: 0

diff --git a/ci/azure/azure-nvidia-12-ubuntu-mpich.yml b/ci/azure/azure-nvidia-12-ubuntu-mpich.yml
@@ -58,7 +58,7 @@ variables:
   TEST_LB_SCHEMA: 0
   CACHE: "$(Agent.TempDirectory)/cache/"
   cache_name: ubuntu-nvidia-12-cache
-  build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache/ubuntu-cpp"
+  build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache"
   TS: 0
   TS_YEAR: 0
   TS_MONTH: 0

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -146,7 +146,7 @@ services:
       <<: [*ccache, *vtopts]
     volumes: &ubuntu-volumes
       - .:/vt:delegated
-      - ${FULL_CACHE_PATH}ubuntu-cpp:/build:delegated
+      - ${build_root}ubuntu-cpp:/build:delegated
     command: &vt-cpp-command >
       /bin/bash -c "
         /vt/ci/build_cpp.sh /vt /build &&
@@ -376,7 +376,7 @@ services:
       <<: [*ccache, *vtopts]
     volumes: &alpine-volumes
       - .:/vt:delegated
-      - ${FULL_CACHE_PATH}alpine-cpp:/build:delegated
+      - ${build_root}alpine-cpp:/build:delegated
     command: *vt-cpp-command
 
   ##############################################################################

diff --git a/scripts/workflows-azure.ini b/scripts/workflows-azure.ini
@@ -33,7 +33,7 @@ triggers = "trigger:\\n  branches:\\n    include:\\n      - develop\\n      - ma
 warning = "###############################################################################\\n############## Warning this is a generated file---do not modify ###############\\n###############################################################################"
 job_name = build
 workflow_runs_on = "vmImage: 'ubuntu-22.04'"
-build_root = $(ARCH)-[% linux %]-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache/ubuntu-cpp
+build_root = $(ARCH)-[% linux %]-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache
 linux_env = "  UBUNTU: [% distro %]"
 vt_diagnostics = 1
 pr_pattern = "pr:\\n  drafts: false\\n  autoCancel: true\\n  branches:\\n    include:\\n      - '*'\\n"
@@ -147,7 +147,7 @@ is_ubuntu = 0
 linux = alpine
 linux_env =""
 output_name = ci/azure/azure-clang-alpine-mpich.yml
-build_root = $(ARCH)-[% linux %]-$(HOST_COMPILER)-$(COMPILER)-cache/alpine-cpp
+build_root = $(ARCH)-[% linux %]-$(HOST_COMPILER)-$(COMPILER)-cache
 vt_production_build = 1
 
 [PR-tests-clang-9]