get-deploy-paths: Remove spack-package* outputs

CodeGat · CodeGat · commit f82ca407ff75 · 2025-10-30T11:27:20.000+11:00
Release instances of spack manage spack-packages, and Prerelease instances have spack-packages under the environment folder
diff --git a/.github/actions/get-deploy-paths/action.yml b/.github/actions/get-deploy-paths/action.yml
@@ -25,31 +25,24 @@ inputs:
     required: true
     description: |
       Spack environment name that is used for this deployment.
-      Used to construct Prerelease spack-packages path, which is demarcated by the environment name.
 outputs:
   root:
     description: |
       Path to the root of a specific deployment of `spack`.
-      This path contains `spack-{packages,config}` repositories as well.
+      This path contains `spack-config` and various `spack-packages` repositories in it's hierarchy as well.
     value: ${{ steps.path.outputs.root }}
   spack:
     description: Path to a specific installation of `spack`.
     value: ${{ steps.path.outputs.spack }}
   spack-config:
     description: Path to the ACCESS-NRI/spack-config repository associated with the install of spack.
     value: ${{ steps.path.outputs.spack-config }}
-  spack-packages-root:
-    description: |
-      Path to the folder containing all ACCESS-NRI/spack-packages repositories used in the install of spack.
-      For Release inputs.deployment-type, this is the repository itself.
-      For Prerelease inputs.deployment-type, this is the folder containing multiple spack-packages repositories.
-    value: ${{ steps.path.outputs.spack-packages-root }}
-  spack-packages:
-    description: Path to the ACCESS-NRI/spack-packages repository associated with the environment created in the install of spack.
-    value: ${{ steps.path.outputs.spack-packages }}
   spack-environment:
-    description: Path to the spack environment folder for the given inputs.spack-environment.
+    description: Path to the spack environment folder for the given inputs.spack-environment. Also contains the `spack-packages` repository for Prerelease deployments.
     value: ${{ steps.path.outputs.spack-environment }}
+  # Regarding our other important repository path, spack-packages:
+  # Release instances of spack-packages are now managed by spack itself via `spack repo` commands, so deployment doesn't actually need to know where it is.
+  # Prerelease instances of spack-packages are located within the outputs.spack-environment folder, and are removed when that environment is removed, so there is no need to track them either.
 runs:
   using: composite
   steps:
@@ -79,12 +72,4 @@ runs:
         echo "root=$root" >> $GITHUB_OUTPUT
         echo "spack=$root/spack" >> $GITHUB_OUTPUT
         echo "spack-config=$root/spack-config" >> $GITHUB_OUTPUT
-        echo "spack-packages-root=$root/spack-packages" >> $GITHUB_OUTPUT
-
-        if [[ '${{ steps.validate.outputs.type }}' == Release ]]; then
-          echo "spack-packages=$root/spack-packages" >> $GITHUB_OUTPUT
-        elif [[ '${{ steps.validate.outputs.type }}' == Prerelease ]]; then
-          echo "spack-packages=$root/spack-packages/${{ inputs.spack-environment }}/spack-packages" >> $GITHUB_OUTPUT
-        fi
-
         echo "spack-environment=$root/environments/${{ inputs.spack-environment }}" >> $GITHUB_OUTPUT
diff --git a/.github/workflows/deploy-2-start.yml b/.github/workflows/deploy-2-start.yml
@@ -149,7 +149,7 @@ jobs:
           python -m scripts.spack_manifest.injection.prerelease \
             --manifest ../${{ inputs.spack-manifest-path }} \
             --version ${{ inputs.version }} \
-            --spack-packages-path ${{ steps.path.outputs.spack-packages }} \
+            --spack-packages-path ${{ steps.path.outputs.spack-environment }}/access-spack-packages \
             --output ../${{ inputs.spack-manifest-path }}
 
       - name: Copy ${{ inputs.spack-manifest-path }}
diff --git a/.github/workflows/undeploy-1-start.yml b/.github/workflows/undeploy-1-start.yml
@@ -83,16 +83,6 @@ jobs:
           spack gc --except-any-environment --yes-to-all
           EOT
 
-      - name: Undeploy spack-packages
-        # ssh into deployment environment, remove all the unneeded spack-packages installations
-        run: |
-          ssh ${{ secrets.USER}}@${{ secrets.HOST }} -i ${{ steps.ssh.outputs.private-key-path }} /bin/bash <<'EOT'
-          find "${{ steps.path.outputs.spack-packages-root }}" \
-            -mindepth 1 -maxdepth 1 \
-            -type d -name "${{ inputs.version-pattern }}" \
-            -exec rm -rfv {} +
-          EOT
-
       - name: Undeploy Status Notifier
         if: failure()
         run: echo '::error::Deployment ${{ inputs.version-pattern }} could not be removed from ${{ inputs.target }} ${{ inputs.type }}, found at ${{ steps.path.outputs.spack }}. Please check manually.'
