@@ -281,7 +281,12 @@ jobs:
281281 ln --symbolic --relative --verbose --force ${{ steps.env.outputs.SPACK_ROOT }}/../spack-config/${spack_branch}/ci-upstream/* ${{ steps.env.outputs.SPACK_ROOT }}/etc/spack/
282282
283283 - name : Spack - Initial Enable
284- run : . ${{ steps.env.outputs.SPACK_ROOT }}/share/spack/setup-env.sh
284+ run : |
285+ . ${{ steps.env.outputs.SPACK_ROOT }}/share/spack/setup-env.sh
286+ echo "----- Compilers -----"
287+ spack compiler list
288+ echo "----- Packages -----"
289+ spack find
285290
286291 - name : Spack - Get spack-packages repo locations
287292 id : spack-packages-locations
@@ -309,30 +314,6 @@ jobs:
309314 ref : ${{ inputs.access-spack-packages-ref }}
310315 spack-instance-root-path : ${{ steps.env.outputs.SPACK_ROOT }}
311316
312- - name : Spack - Compiler Load
313- run : |
314- . ${{ steps.env.outputs.SPACK_ROOT }}/share/spack/setup-env.sh
315-
316- # Find potential upstream compiler lockfile path
317- if [ -f "/opt/upstream/compilers.spack.lock" ]; then
318- compiler_lockfile_path="/opt/upstream/compilers.spack.lock"
319- elif [ -f "/opt/environments/compilers/spack.lock" ]; then
320- compiler_lockfile_path="/opt/environments/compilers/spack.lock"
321- else
322- echo "::warning::No upstream compilers.spack.lock or environments/compilers/spack.lock found, skipping compiler load from upstream"
323- exit 0
324- fi
325-
326- # Attempt a load of compilers via upstream compilers lockfile
327- echo "Found $compiler_lockfile_path, attempting to load compilers from upstream"
328- yq '.roots[].hash' "$compiler_lockfile_path" | while read hash; do
329- echo "Loading compiler with hash: $hash"
330- spack load /$hash
331- spack compiler find --scope=site
332- done
333-
334- spack find
335-
336317 - name : Spack - OCI Buildcache Init
337318 if : inputs.spack-oci-buildcache-url != ''
338319 run : |
0 commit comments