Remove unnecessary logic to add/remove binary caches for GitHub workflows

climbfuji · climbfuji · commit 488b027dd94d · 2026-01-25T18:45:54.000-07:00
diff --git a/.github/workflows/ubuntu-ci-x86_64-gnu.yaml b/.github/workflows/ubuntu-ci-x86_64-gnu.yaml
@@ -50,17 +50,6 @@ jobs:
 
       - name: create-buildcache
         run: |
-          # Get day of week to decide whether to use build caches or not
-          DOW=$(date +%u)
-          # Monday is 1 ... Sunday is 7
-          if [[ $DOW == 7 ]]; then
-            export USE_BINARY_CACHE=false
-            echo "Ignore existing binary cache for creating buildcache environment"
-          else
-            export USE_BINARY_CACHE=true
-            echo "Use existing binary cache for creating buildcache environment"
-          fi
-
           # Set up spack-stack
           source ./setup.sh
 
@@ -126,15 +115,13 @@ jobs:
             spack mirror add local-source file://${SOURCE_CACHE_PATH}/
             spack mirror create -a -d ${SOURCE_CACHE_PATH}/
 
-            # Add binary cache if requested
-            if [ "$USE_BINARY_CACHE" = true ] ; then
-              set +e
-              spack mirror add local-binary file://${BUILD_CACHE_PATH}/
-              spack buildcache update-index local-binary
-              set -e
-              echo "Packages in spack binary cache:"
-              spack buildcache list
-            fi
+            # Add binary cache
+            set +e
+            spack mirror add local-binary file://${BUILD_CACHE_PATH}/
+            spack buildcache update-index local-binary
+            set -e
+            echo "Packages in spack binary cache:"
+            spack buildcache list
 
             # Break installation up in pieces and create build caches in between
             # This allows us to "spin up" builds that altogether take longer than
@@ -169,11 +156,6 @@ jobs:
             spack install --fail-fast --source --no-check-signature 2>&1 | tee log.install.${ENVNAME}.all
             spack buildcache create -u local-binary
 
-            # Remove binary cache for next round of concretization
-            if [ "$USE_BINARY_CACHE" = true ] ; then
-              spack mirror rm local-binary
-            fi
-
             # Remove buildcache config settings
             spack config remove config:install_tree:padded_length
 
@@ -201,11 +183,6 @@ jobs:
           ${SPACK_STACK_DIR}/util/show_duplicate_packages.py -i fms -i crtm -i crtm-fix -i esmf -i mapl -i py-cython -i neptune-env -i fms -i ip
           spack stack check-preferred-compiler 2>&1 | tee log.check-preferred-compiler.${ENVNAME}
 
-          # Add binary cache back in
-          spack mirror add local-binary file://${BUILD_CACHE_PATH}/
-          echo "Packages in combined spack build caches:"
-          spack buildcache list
-
           # Install from cache
           spack install --fail-fast --source --no-check-signature 2>&1 | tee log.install.${ENVNAME}.all
 
diff --git a/.github/workflows/ubuntu-ci-x86_64-oneapi-ifx.yaml b/.github/workflows/ubuntu-ci-x86_64-oneapi-ifx.yaml
@@ -50,17 +50,6 @@ jobs:
 
       - name: create-buildcache
         run: |
-          # Get day of week to decide whether to use build caches or not
-          DOW=$(date +%u)
-          # Monday is 1 ... Sunday is 7
-          if [[ $DOW == 7 ]]; then
-            export USE_BINARY_CACHE=false
-            echo "Ignore existing binary cache for creating buildcache environment"
-          else
-            export USE_BINARY_CACHE=true
-            echo "Use existing binary cache for creating buildcache environment"
-          fi
-
           # Set up spack-stack
           source ./setup.sh
 
@@ -142,15 +131,13 @@ jobs:
             spack mirror add local-source file://${SOURCE_CACHE_PATH}/
             spack mirror create -a -d ${SOURCE_CACHE_PATH}/
 
-            # Add binary cache if requested
-            if [ "$USE_BINARY_CACHE" = true ] ; then
-              set +e
-              spack mirror add local-binary file://${BUILD_CACHE_PATH}/
-              spack buildcache update-index local-binary
-              set -e
-              echo "Packages in spack binary cache:"
-              spack buildcache list
-            fi
+            # Add binary cache
+            set +e
+            spack mirror add local-binary file://${BUILD_CACHE_PATH}/
+            spack buildcache update-index local-binary
+            set -e
+            echo "Packages in spack binary cache:"
+            spack buildcache list
 
             # Break installation up in pieces and create build caches in between
             # This allows us to "spin up" builds that altogether take longer than
@@ -188,11 +175,6 @@ jobs:
             # Check for libirc.so in shared libraries (returns 1=error if found)
             ${SPACK_STACK_DIR}/util/check_libirc.sh
 
-            # Remove binary cache for next round of concretization
-            if [ "$USE_BINARY_CACHE" = true ] ; then
-              spack mirror rm local-binary
-            fi
-
             # Remove buildcache config settings
             spack config remove config:install_tree:padded_length
 
@@ -220,11 +202,6 @@ jobs:
           ${SPACK_STACK_DIR}/util/show_duplicate_packages.py -i fms -i crtm -i crtm-fix -i esmf -i mapl -i py-cython -i neptune-env -i fms -i ip
           spack stack check-preferred-compiler 2>&1 | tee log.check-preferred-compiler.${ENVNAME}
 
-          # Add binary cache back in
-          spack mirror add local-binary file://${BUILD_CACHE_PATH}/
-          echo "Packages in combined spack build caches:"
-          spack buildcache list
-
           # Install from cache
           spack install --fail-fast --source --no-check-signature 2>&1 | tee log.install.${ENVNAME}.all
 
diff --git a/.github/workflows/ubuntu-ci-x86_64-oneapi.yaml b/.github/workflows/ubuntu-ci-x86_64-oneapi.yaml
@@ -50,17 +50,6 @@ jobs:
 
       - name: create-buildcache
         run: |
-          # Get day of week to decide whether to use build caches or not
-          DOW=$(date +%u)
-          # Monday is 1 ... Sunday is 7
-          if [[ $DOW == 7 ]]; then
-            export USE_BINARY_CACHE=false
-            echo "Ignore existing binary cache for creating buildcache environment"
-          else
-            export USE_BINARY_CACHE=true
-            echo "Use existing binary cache for creating buildcache environment"
-          fi
-
           # Set up spack-stack
           source ./setup.sh
 
@@ -142,15 +131,13 @@ jobs:
             spack mirror add local-source file://${SOURCE_CACHE_PATH}/
             spack mirror create -a -d ${SOURCE_CACHE_PATH}/
 
-            # Add binary cache if requested
-            if [ "$USE_BINARY_CACHE" = true ] ; then
-              set +e
-              spack mirror add local-binary file://${BUILD_CACHE_PATH}/
-              spack buildcache update-index local-binary
-              set -e
-              echo "Packages in spack binary cache:"
-              spack buildcache list
-            fi
+            # Add binary cache
+            set +e
+            spack mirror add local-binary file://${BUILD_CACHE_PATH}/
+            spack buildcache update-index local-binary
+            set -e
+            echo "Packages in spack binary cache:"
+            spack buildcache list
 
             # Break installation up in pieces and create build caches in between
             # This allows us to "spin up" builds that altogether take longer than
@@ -188,11 +175,6 @@ jobs:
             # Check for libirc.so in shared libraries (returns 1=error if found)
             ${SPACK_STACK_DIR}/util/check_libirc.sh
 
-            # Remove binary cache for next round of concretization
-            if [ "$USE_BINARY_CACHE" = true ] ; then
-              spack mirror rm local-binary
-            fi
-
             # Remove buildcache config settings
             spack config remove config:install_tree:padded_length
 
@@ -220,11 +202,6 @@ jobs:
           ${SPACK_STACK_DIR}/util/show_duplicate_packages.py -i fms -i crtm -i crtm-fix -i esmf -i mapl -i py-cython -i neptune-env -i fms -i ip
           spack stack check-preferred-compiler 2>&1 | tee log.check-preferred-compiler.${ENVNAME}
 
-          # Add binary cache back in
-          spack mirror add local-binary file://${BUILD_CACHE_PATH}/
-          echo "Packages in combined spack build caches:"
-          spack buildcache list
-
           # Install from cache
           spack install --fail-fast --source --no-check-signature 2>&1 | tee log.install.${ENVNAME}.all
 
