Skip to content

Commit

Permalink
Overhaul packages.yaml (#1138)
Browse files Browse the repository at this point in the history
This PR updates common/packages.yaml to remove unused entries, unpin versions that don't need to be pinned, and apply hard requirements as much as possible.

It also includes a few selected site config updates (for CI, Hera, Nautilus).

---------

Co-authored-by: Dom Heinzeller <dom.heinzeller@icloud.com>
  • Loading branch information
AlexanderRichert-NOAA and climbfuji authored Jun 29, 2024
1 parent 3b14cd3 commit a8c3c88
Show file tree
Hide file tree
Showing 31 changed files with 158 additions and 642 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/macos-ci-aarch64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -151,13 +151,13 @@ jobs:
# Test environment chaining
echo "Test environment chaining"
spack stack create env --name chaintest --template empty --site macos.default --upstream $(realpath envs/${ENVNAME}/install)
spack stack create env --name chaintest --template empty --site macos.default --upstream ${ENVDIR}/install
# Retain config from upstream so we don't have to rebuild:
cp -r $PWD/envs/${ENVNAME}/{site,common} $PWD/envs/chaintest/.
cp -r ${ENVDIR}/{site,common} $PWD/envs/chaintest/.
spack env activate ${PWD}/envs/chaintest
spack add nccmp@1.8.9.0%apple-clang
spack add nccmp@1.9.0.1%apple-clang
spack concretize | tee envs/chaintest/log.concretize
unwanted_duplicates=$(( cat envs/chaintest/log.concretize | grep -E '^ - ' | grep -Fv 'nccmp@1.8.9.0' || true ) | wc -l)
unwanted_duplicates=$(( cat envs/chaintest/log.concretize | grep -E '^ - ' | grep -Fv 'nccmp@1.9.0.1' || true ) | wc -l)
if [ ${unwanted_duplicates} -gt 0 ]; then echo "Environment chaining test failed"; exit 1; fi
spack env deactivate
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/ubuntu-ci-x86_64-gnu.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -166,13 +166,13 @@ jobs:
# Test environment chaining
echo "Test environment chaining"
spack stack create env --name chaintest --template empty --site linux.default --upstream $(realpath envs/${ENVNAME}/install)
spack stack create env --name chaintest --template empty --site linux.default --upstream ${ENVDIR}/install
# Retain config from upstream so we don't have to rebuild:
cp -r $PWD/envs/${ENVNAME}/{site,common} $PWD/envs/chaintest/.
cp -r ${ENVDIR}/{site,common} $PWD/envs/chaintest/.
spack env activate ${PWD}/envs/chaintest
spack add nccmp@1.8.9.0%gcc
spack add nccmp@1.9.0.1%gcc
spack concretize | tee envs/chaintest/log.concretize
unwanted_duplicates=$(( cat envs/chaintest/log.concretize | grep -E '^ - ' | grep -Fv 'nccmp@1.8.9.0' || true ) | wc -l)
unwanted_duplicates=$(( cat envs/chaintest/log.concretize | grep -E '^ - ' | grep -Fv 'nccmp@1.9.0.1' || true ) | wc -l)
if [ ${unwanted_duplicates} -gt 0 ]; then echo "Environment chaining test failed"; exit 1; fi
spack env deactivate
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/ubuntu-ci-x86_64-intel.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ jobs:
# Add external ecflow for Intel
echo "" >> ${SPACK_SYSTEM_CONFIG_PATH}/packages.yaml
echo " ecflow:" >> ${SPACK_SYSTEM_CONFIG_PATH}/packages.yaml
echo " ecflow::" >> ${SPACK_SYSTEM_CONFIG_PATH}/packages.yaml
echo " buildable: False" >> ${SPACK_SYSTEM_CONFIG_PATH}/packages.yaml
echo " externals:" >> ${SPACK_SYSTEM_CONFIG_PATH}/packages.yaml
echo " - spec: ecflow@5.8.4+ui+static_boost" >> ${SPACK_SYSTEM_CONFIG_PATH}/packages.yaml
Expand Down Expand Up @@ -208,13 +208,13 @@ jobs:
# Test environment chaining
echo "Test environment chaining"
spack stack create env --name chaintest --template empty --site linux.default --upstream $(realpath envs/${ENVNAME}/install)
spack stack create env --name chaintest --template empty --site linux.default --upstream ${ENVDIR}/install
# Retain config from upstream so we don't have to rebuild:
cp -r $PWD/envs/${ENVNAME}/{site,common} $PWD/envs/chaintest/.
cp -r ${ENVDIR}/{site,common} $PWD/envs/chaintest/.
spack env activate ${PWD}/envs/chaintest
spack add nccmp@1.8.9.0%intel
spack add nccmp@1.9.0.1%intel
spack concretize | tee envs/chaintest/log.concretize
unwanted_duplicates=$(( cat envs/chaintest/log.concretize | grep -E '^ - ' | grep -Fv 'nccmp@1.8.9.0' || true ) | wc -l)
unwanted_duplicates=$(( cat envs/chaintest/log.concretize | grep -E '^ - ' | grep -Fv 'nccmp@1.9.0.1' || true ) | wc -l)
if [ ${unwanted_duplicates} -gt 0 ]; then echo "Environment chaining test failed"; exit 1; fi
spack env deactivate
Expand Down
Loading

0 comments on commit a8c3c88

Please sign in to comment.