#2: fix condition in setup script

DARMA-tasking · Dec 18, 2024 · 8d243af · 8d243af
1 parent 7f8ee3b
commit 8d243af
Show file tree

Hide file tree

Showing 23 changed files with 46 additions and 46 deletions.
diff --git a/ci/setup-template.sh b/ci/setup-template.sh
@@ -76,6 +76,8 @@ echo "-- Installing dependencies..."
 echo "--"
 
 if [ $WF_DOCKER == "1" ]; then
+    cd $WF_TMP_DIR/deps
+else
     WF_DEPS_URL="https://raw.githubusercontent.com/DARMA-tasking/workflows/refs/heads/2-implement-common-docker-containers/ci/shared/scripts/deps"
     # if this is run directly from a runner from an external project
     # trigger deps download from the workflows repo.
@@ -84,8 +86,6 @@ if [ $WF_DOCKER == "1" ]; then
     # 1. Download dependency installation script
     cd $WF_TMP_DIR/deps
     %DEPS_DOWNLOAD%
-else
-    cd $WF_TMP_DIR/deps
 fi
 
 chmod u+x *.sh

diff --git a/ci/shared/scripts/setup-amd64-alpine-clang-13-cpp.sh b/ci/shared/scripts/setup-amd64-alpine-clang-13-cpp.sh
@@ -76,6 +76,8 @@ echo "-- Installing dependencies..."
 echo "--"
 
 if [ $WF_DOCKER == "1" ]; then
+    cd $WF_TMP_DIR/deps
+else
     WF_DEPS_URL="https://raw.githubusercontent.com/DARMA-tasking/workflows/refs/heads/2-implement-common-docker-containers/ci/shared/scripts/deps"
     # if this is run directly from a runner from an external project
     # trigger deps download from the workflows repo.
@@ -85,8 +87,6 @@ if [ $WF_DOCKER == "1" ]; then
     cd $WF_TMP_DIR/deps
     wget $WF_DEPS_URL/packages.sh
     wget $WF_DEPS_URL/mpich.sh
-else
-    cd $WF_TMP_DIR/deps
 fi
 
 chmod u+x *.sh

diff --git a/ci/shared/scripts/setup-amd64-ubuntu-18.04-gcc-8-gcc-8-cpp.sh b/ci/shared/scripts/setup-amd64-ubuntu-18.04-gcc-8-gcc-8-cpp.sh
@@ -76,6 +76,8 @@ echo "-- Installing dependencies..."
 echo "--"
 
 if [ $WF_DOCKER == "1" ]; then
+    cd $WF_TMP_DIR/deps
+else
     WF_DEPS_URL="https://raw.githubusercontent.com/DARMA-tasking/workflows/refs/heads/2-implement-common-docker-containers/ci/shared/scripts/deps"
     # if this is run directly from a runner from an external project
     # trigger deps download from the workflows repo.
@@ -86,8 +88,6 @@ if [ $WF_DOCKER == "1" ]; then
     wget $WF_DEPS_URL/packages.sh
     wget $WF_DEPS_URL/cmake.sh
     wget $WF_DEPS_URL/mpich.sh
-else
-    cd $WF_TMP_DIR/deps
 fi
 
 chmod u+x *.sh

diff --git a/ci/shared/scripts/setup-amd64-ubuntu-20.04-clang-10-cpp.sh b/ci/shared/scripts/setup-amd64-ubuntu-20.04-clang-10-cpp.sh
@@ -76,6 +76,8 @@ echo "-- Installing dependencies..."
 echo "--"
 
 if [ $WF_DOCKER == "1" ]; then
+    cd $WF_TMP_DIR/deps
+else
     WF_DEPS_URL="https://raw.githubusercontent.com/DARMA-tasking/workflows/refs/heads/2-implement-common-docker-containers/ci/shared/scripts/deps"
     # if this is run directly from a runner from an external project
     # trigger deps download from the workflows repo.
@@ -87,8 +89,6 @@ if [ $WF_DOCKER == "1" ]; then
     wget $WF_DEPS_URL/cmake.sh
     wget $WF_DEPS_URL/libunwind.sh
     wget $WF_DEPS_URL/mpich.sh
-else
-    cd $WF_TMP_DIR/deps
 fi
 
 chmod u+x *.sh

diff --git a/ci/shared/scripts/setup-amd64-ubuntu-20.04-clang-9-cpp.sh b/ci/shared/scripts/setup-amd64-ubuntu-20.04-clang-9-cpp.sh
@@ -76,6 +76,8 @@ echo "-- Installing dependencies..."
 echo "--"
 
 if [ $WF_DOCKER == "1" ]; then
+    cd $WF_TMP_DIR/deps
+else
     WF_DEPS_URL="https://raw.githubusercontent.com/DARMA-tasking/workflows/refs/heads/2-implement-common-docker-containers/ci/shared/scripts/deps"
     # if this is run directly from a runner from an external project
     # trigger deps download from the workflows repo.
@@ -87,8 +89,6 @@ if [ $WF_DOCKER == "1" ]; then
     wget $WF_DEPS_URL/cmake.sh
     wget $WF_DEPS_URL/libunwind.sh
     wget $WF_DEPS_URL/mpich.sh
-else
-    cd $WF_TMP_DIR/deps
 fi
 
 chmod u+x *.sh

diff --git a/ci/shared/scripts/setup-amd64-ubuntu-20.04-gcc-10-openmpi-cpp.sh b/ci/shared/scripts/setup-amd64-ubuntu-20.04-gcc-10-openmpi-cpp.sh
@@ -76,6 +76,8 @@ echo "-- Installing dependencies..."
 echo "--"
 
 if [ $WF_DOCKER == "1" ]; then
+    cd $WF_TMP_DIR/deps
+else
     WF_DEPS_URL="https://raw.githubusercontent.com/DARMA-tasking/workflows/refs/heads/2-implement-common-docker-containers/ci/shared/scripts/deps"
     # if this is run directly from a runner from an external project
     # trigger deps download from the workflows repo.
@@ -86,8 +88,6 @@ if [ $WF_DOCKER == "1" ]; then
     wget $WF_DEPS_URL/packages.sh
     wget $WF_DEPS_URL/cmake.sh
     wget $WF_DEPS_URL/openmpi.sh
-else
-    cd $WF_TMP_DIR/deps
 fi
 
 chmod u+x *.sh

diff --git a/ci/shared/scripts/setup-amd64-ubuntu-20.04-gcc-9-cpp.sh b/ci/shared/scripts/setup-amd64-ubuntu-20.04-gcc-9-cpp.sh
@@ -76,6 +76,8 @@ echo "-- Installing dependencies..."
 echo "--"
 
 if [ $WF_DOCKER == "1" ]; then
+    cd $WF_TMP_DIR/deps
+else
     WF_DEPS_URL="https://raw.githubusercontent.com/DARMA-tasking/workflows/refs/heads/2-implement-common-docker-containers/ci/shared/scripts/deps"
     # if this is run directly from a runner from an external project
     # trigger deps download from the workflows repo.
@@ -86,8 +88,6 @@ if [ $WF_DOCKER == "1" ]; then
     wget $WF_DEPS_URL/packages.sh
     wget $WF_DEPS_URL/cmake.sh
     wget $WF_DEPS_URL/mpich.sh
-else
-    cd $WF_TMP_DIR/deps
 fi
 
 chmod u+x *.sh

diff --git a/ci/shared/scripts/setup-amd64-ubuntu-20.04-gcc-9-cuda-11.2.2-cpp.sh b/ci/shared/scripts/setup-amd64-ubuntu-20.04-gcc-9-cuda-11.2.2-cpp.sh
@@ -76,6 +76,8 @@ echo "-- Installing dependencies..."
 echo "--"
 
 if [ $WF_DOCKER == "1" ]; then
+    cd $WF_TMP_DIR/deps
+else
     WF_DEPS_URL="https://raw.githubusercontent.com/DARMA-tasking/workflows/refs/heads/2-implement-common-docker-containers/ci/shared/scripts/deps"
     # if this is run directly from a runner from an external project
     # trigger deps download from the workflows repo.
@@ -87,8 +89,6 @@ if [ $WF_DOCKER == "1" ]; then
     wget $WF_DEPS_URL/cmake.sh
     wget $WF_DEPS_URL/mpich.sh
     wget $WF_DEPS_URL/nvcc_wrapper.sh
-else
-    cd $WF_TMP_DIR/deps
 fi
 
 chmod u+x *.sh

diff --git a/ci/shared/scripts/setup-amd64-ubuntu-20.04-gcc-9-cuda-12.2.0-cpp.sh b/ci/shared/scripts/setup-amd64-ubuntu-20.04-gcc-9-cuda-12.2.0-cpp.sh
@@ -76,6 +76,8 @@ echo "-- Installing dependencies..."
 echo "--"
 
 if [ $WF_DOCKER == "1" ]; then
+    cd $WF_TMP_DIR/deps
+else
     WF_DEPS_URL="https://raw.githubusercontent.com/DARMA-tasking/workflows/refs/heads/2-implement-common-docker-containers/ci/shared/scripts/deps"
     # if this is run directly from a runner from an external project
     # trigger deps download from the workflows repo.
@@ -87,8 +89,6 @@ if [ $WF_DOCKER == "1" ]; then
     wget $WF_DEPS_URL/cmake.sh
     wget $WF_DEPS_URL/mpich.sh
     wget $WF_DEPS_URL/nvcc_wrapper.sh
-else
-    cd $WF_TMP_DIR/deps
 fi
 
 chmod u+x *.sh

diff --git a/ci/shared/scripts/setup-amd64-ubuntu-20.04-icpc-cpp.sh b/ci/shared/scripts/setup-amd64-ubuntu-20.04-icpc-cpp.sh
@@ -76,6 +76,8 @@ echo "-- Installing dependencies..."
 echo "--"
 
 if [ $WF_DOCKER == "1" ]; then
+    cd $WF_TMP_DIR/deps
+else
     WF_DEPS_URL="https://raw.githubusercontent.com/DARMA-tasking/workflows/refs/heads/2-implement-common-docker-containers/ci/shared/scripts/deps"
     # if this is run directly from a runner from an external project
     # trigger deps download from the workflows repo.
@@ -86,8 +88,6 @@ if [ $WF_DOCKER == "1" ]; then
     wget $WF_DEPS_URL/packages.sh
     wget $WF_DEPS_URL/cmake.sh
     wget $WF_DEPS_URL/mpich.sh
-else
-    cd $WF_TMP_DIR/deps
 fi
 
 chmod u+x *.sh

diff --git a/ci/shared/scripts/setup-amd64-ubuntu-20.04-icpx-cpp.sh b/ci/shared/scripts/setup-amd64-ubuntu-20.04-icpx-cpp.sh
@@ -76,6 +76,8 @@ echo "-- Installing dependencies..."
 echo "--"
 
 if [ $WF_DOCKER == "1" ]; then
+    cd $WF_TMP_DIR/deps
+else
     WF_DEPS_URL="https://raw.githubusercontent.com/DARMA-tasking/workflows/refs/heads/2-implement-common-docker-containers/ci/shared/scripts/deps"
     # if this is run directly from a runner from an external project
     # trigger deps download from the workflows repo.
@@ -86,8 +88,6 @@ if [ $WF_DOCKER == "1" ]; then
     wget $WF_DEPS_URL/packages.sh
     wget $WF_DEPS_URL/cmake.sh
     wget $WF_DEPS_URL/mpich.sh
-else
-    cd $WF_TMP_DIR/deps
 fi
 
 chmod u+x *.sh

diff --git a/ci/shared/scripts/setup-amd64-ubuntu-22.04-clang-11-cpp.sh b/ci/shared/scripts/setup-amd64-ubuntu-22.04-clang-11-cpp.sh
@@ -76,6 +76,8 @@ echo "-- Installing dependencies..."
 echo "--"
 
 if [ $WF_DOCKER == "1" ]; then
+    cd $WF_TMP_DIR/deps
+else
     WF_DEPS_URL="https://raw.githubusercontent.com/DARMA-tasking/workflows/refs/heads/2-implement-common-docker-containers/ci/shared/scripts/deps"
     # if this is run directly from a runner from an external project
     # trigger deps download from the workflows repo.
@@ -87,8 +89,6 @@ if [ $WF_DOCKER == "1" ]; then
     wget $WF_DEPS_URL/cmake.sh
     wget $WF_DEPS_URL/libunwind.sh
     wget $WF_DEPS_URL/mpich.sh
-else
-    cd $WF_TMP_DIR/deps
 fi
 
 chmod u+x *.sh

diff --git a/ci/shared/scripts/setup-amd64-ubuntu-22.04-clang-12-cpp.sh b/ci/shared/scripts/setup-amd64-ubuntu-22.04-clang-12-cpp.sh
@@ -76,6 +76,8 @@ echo "-- Installing dependencies..."
 echo "--"
 
 if [ $WF_DOCKER == "1" ]; then
+    cd $WF_TMP_DIR/deps
+else
     WF_DEPS_URL="https://raw.githubusercontent.com/DARMA-tasking/workflows/refs/heads/2-implement-common-docker-containers/ci/shared/scripts/deps"
     # if this is run directly from a runner from an external project
     # trigger deps download from the workflows repo.
@@ -87,8 +89,6 @@ if [ $WF_DOCKER == "1" ]; then
     wget $WF_DEPS_URL/cmake.sh
     wget $WF_DEPS_URL/libunwind.sh
     wget $WF_DEPS_URL/mpich.sh
-else
-    cd $WF_TMP_DIR/deps
 fi
 
 chmod u+x *.sh

diff --git a/ci/shared/scripts/setup-amd64-ubuntu-22.04-clang-13-cpp.sh b/ci/shared/scripts/setup-amd64-ubuntu-22.04-clang-13-cpp.sh
@@ -76,6 +76,8 @@ echo "-- Installing dependencies..."
 echo "--"
 
 if [ $WF_DOCKER == "1" ]; then
+    cd $WF_TMP_DIR/deps
+else
     WF_DEPS_URL="https://raw.githubusercontent.com/DARMA-tasking/workflows/refs/heads/2-implement-common-docker-containers/ci/shared/scripts/deps"
     # if this is run directly from a runner from an external project
     # trigger deps download from the workflows repo.
@@ -87,8 +89,6 @@ if [ $WF_DOCKER == "1" ]; then
     wget $WF_DEPS_URL/cmake.sh
     wget $WF_DEPS_URL/libunwind.sh
     wget $WF_DEPS_URL/mpich.sh
-else
-    cd $WF_TMP_DIR/deps
 fi
 
 chmod u+x *.sh

diff --git a/ci/shared/scripts/setup-amd64-ubuntu-22.04-clang-14-cpp.sh b/ci/shared/scripts/setup-amd64-ubuntu-22.04-clang-14-cpp.sh
@@ -76,6 +76,8 @@ echo "-- Installing dependencies..."
 echo "--"
 
 if [ $WF_DOCKER == "1" ]; then
+    cd $WF_TMP_DIR/deps
+else
     WF_DEPS_URL="https://raw.githubusercontent.com/DARMA-tasking/workflows/refs/heads/2-implement-common-docker-containers/ci/shared/scripts/deps"
     # if this is run directly from a runner from an external project
     # trigger deps download from the workflows repo.
@@ -87,8 +89,6 @@ if [ $WF_DOCKER == "1" ]; then
     wget $WF_DEPS_URL/cmake.sh
     wget $WF_DEPS_URL/libunwind.sh
     wget $WF_DEPS_URL/mpich.sh
-else
-    cd $WF_TMP_DIR/deps
 fi
 
 chmod u+x *.sh

diff --git a/ci/shared/scripts/setup-amd64-ubuntu-22.04-gcc-11-cpp.sh b/ci/shared/scripts/setup-amd64-ubuntu-22.04-gcc-11-cpp.sh
@@ -76,6 +76,8 @@ echo "-- Installing dependencies..."
 echo "--"
 
 if [ $WF_DOCKER == "1" ]; then
+    cd $WF_TMP_DIR/deps
+else
     WF_DEPS_URL="https://raw.githubusercontent.com/DARMA-tasking/workflows/refs/heads/2-implement-common-docker-containers/ci/shared/scripts/deps"
     # if this is run directly from a runner from an external project
     # trigger deps download from the workflows repo.
@@ -86,8 +88,6 @@ if [ $WF_DOCKER == "1" ]; then
     wget $WF_DEPS_URL/packages.sh
     wget $WF_DEPS_URL/cmake.sh
     wget $WF_DEPS_URL/mpich.sh
-else
-    cd $WF_TMP_DIR/deps
 fi
 
 chmod u+x *.sh

diff --git a/ci/shared/scripts/setup-amd64-ubuntu-22.04-gcc-12-cpp.sh b/ci/shared/scripts/setup-amd64-ubuntu-22.04-gcc-12-cpp.sh
@@ -76,6 +76,8 @@ echo "-- Installing dependencies..."
 echo "--"
 
 if [ $WF_DOCKER == "1" ]; then
+    cd $WF_TMP_DIR/deps
+else
     WF_DEPS_URL="https://raw.githubusercontent.com/DARMA-tasking/workflows/refs/heads/2-implement-common-docker-containers/ci/shared/scripts/deps"
     # if this is run directly from a runner from an external project
     # trigger deps download from the workflows repo.
@@ -86,8 +88,6 @@ if [ $WF_DOCKER == "1" ]; then
     wget $WF_DEPS_URL/packages.sh
     wget $WF_DEPS_URL/cmake.sh
     wget $WF_DEPS_URL/mpich.sh
-else
-    cd $WF_TMP_DIR/deps
 fi
 
 chmod u+x *.sh

diff --git a/ci/shared/scripts/setup-amd64-ubuntu-22.04-gcc-12-vtk-cpp.sh b/ci/shared/scripts/setup-amd64-ubuntu-22.04-gcc-12-vtk-cpp.sh
@@ -76,6 +76,8 @@ echo "-- Installing dependencies..."
 echo "--"
 
 if [ $WF_DOCKER == "1" ]; then
+    cd $WF_TMP_DIR/deps
+else
     WF_DEPS_URL="https://raw.githubusercontent.com/DARMA-tasking/workflows/refs/heads/2-implement-common-docker-containers/ci/shared/scripts/deps"
     # if this is run directly from a runner from an external project
     # trigger deps download from the workflows repo.
@@ -88,8 +90,6 @@ if [ $WF_DOCKER == "1" ]; then
     wget $WF_DEPS_URL/mpich.sh
     wget $WF_DEPS_URL/mesa.sh
     wget $WF_DEPS_URL/vtk.sh
-else
-    cd $WF_TMP_DIR/deps
 fi
 
 chmod u+x *.sh

diff --git a/ci/shared/scripts/setup-amd64-ubuntu-22.04-gcc-12-zoltan-cpp.sh b/ci/shared/scripts/setup-amd64-ubuntu-22.04-gcc-12-zoltan-cpp.sh
@@ -76,6 +76,8 @@ echo "-- Installing dependencies..."
 echo "--"
 
 if [ $WF_DOCKER == "1" ]; then
+    cd $WF_TMP_DIR/deps
+else
     WF_DEPS_URL="https://raw.githubusercontent.com/DARMA-tasking/workflows/refs/heads/2-implement-common-docker-containers/ci/shared/scripts/deps"
     # if this is run directly from a runner from an external project
     # trigger deps download from the workflows repo.
@@ -87,8 +89,6 @@ if [ $WF_DOCKER == "1" ]; then
     wget $WF_DEPS_URL/cmake.sh
     wget $WF_DEPS_URL/mpich.sh
     wget $WF_DEPS_URL/zoltan.sh
-else
-    cd $WF_TMP_DIR/deps
 fi
 
 chmod u+x *.sh

diff --git a/ci/shared/scripts/setup-amd64-ubuntu-24.04-clang-16-cpp.sh b/ci/shared/scripts/setup-amd64-ubuntu-24.04-clang-16-cpp.sh
@@ -76,6 +76,8 @@ echo "-- Installing dependencies..."
 echo "--"
 
 if [ $WF_DOCKER == "1" ]; then
+    cd $WF_TMP_DIR/deps
+else
     WF_DEPS_URL="https://raw.githubusercontent.com/DARMA-tasking/workflows/refs/heads/2-implement-common-docker-containers/ci/shared/scripts/deps"
     # if this is run directly from a runner from an external project
     # trigger deps download from the workflows repo.
@@ -87,8 +89,6 @@ if [ $WF_DOCKER == "1" ]; then
     wget $WF_DEPS_URL/cmake.sh
     wget $WF_DEPS_URL/libunwind.sh
     wget $WF_DEPS_URL/mpich.sh
-else
-    cd $WF_TMP_DIR/deps
 fi
 
 chmod u+x *.sh

diff --git a/ci/shared/scripts/setup-amd64-ubuntu-24.04-clang-16-vtk-cpp.sh b/ci/shared/scripts/setup-amd64-ubuntu-24.04-clang-16-vtk-cpp.sh
@@ -76,6 +76,8 @@ echo "-- Installing dependencies..."
 echo "--"
 
 if [ $WF_DOCKER == "1" ]; then
+    cd $WF_TMP_DIR/deps
+else
     WF_DEPS_URL="https://raw.githubusercontent.com/DARMA-tasking/workflows/refs/heads/2-implement-common-docker-containers/ci/shared/scripts/deps"
     # if this is run directly from a runner from an external project
     # trigger deps download from the workflows repo.
@@ -89,8 +91,6 @@ if [ $WF_DOCKER == "1" ]; then
     wget $WF_DEPS_URL/mpich.sh
     wget $WF_DEPS_URL/mesa.sh
     wget $WF_DEPS_URL/vtk.sh
-else
-    cd $WF_TMP_DIR/deps
 fi
 
 chmod u+x *.sh

diff --git a/ci/shared/scripts/setup-amd64-ubuntu-24.04-clang-16-zoltan-cpp.sh b/ci/shared/scripts/setup-amd64-ubuntu-24.04-clang-16-zoltan-cpp.sh
@@ -76,6 +76,8 @@ echo "-- Installing dependencies..."
 echo "--"
 
 if [ $WF_DOCKER == "1" ]; then
+    cd $WF_TMP_DIR/deps
+else
     WF_DEPS_URL="https://raw.githubusercontent.com/DARMA-tasking/workflows/refs/heads/2-implement-common-docker-containers/ci/shared/scripts/deps"
     # if this is run directly from a runner from an external project
     # trigger deps download from the workflows repo.
@@ -88,8 +90,6 @@ if [ $WF_DOCKER == "1" ]; then
     wget $WF_DEPS_URL/libunwind.sh
     wget $WF_DEPS_URL/mpich.sh
     wget $WF_DEPS_URL/zoltan.sh
-else
-    cd $WF_TMP_DIR/deps
 fi
 
 chmod u+x *.sh