Skip to content

Commit 8c81ec8

Browse files
authored
Add neptune-env to list of allowed duplicate packages in util/nrl/batch_install.sh and util/weekly_build/03_SetupEnv.sh to enable debug and release builds of it (#1682)
Add neptune-env to list of allowed duplicate packages in util/nrl/batch_install.sh and util/weekly_build/03_SetupEnv.sh to enable debug and release builds of it. This is necessary because of #1673. A similar change was made for the GitHub actions testing on the Ubuntu CI runner as part of #1673.
1 parent 79fc488 commit 8c81ec8

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

util/nrl/batch_install.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -521,7 +521,7 @@ for compiler in "${SPACK_STACK_BATCH_COMPILERS[@]}"; do
521521
fi
522522

523523
# Check for duplicate packages
524-
./util/show_duplicate_packages.py -i crtm -i crtm-fix -i esmf -i mapl
524+
./util/show_duplicate_packages.py -i crtm -i crtm-fix -i esmf -i mapl -i neptune-env
525525

526526
# Update local source cache if requested
527527
if [[ "${update_source_cache}" == "true"* ]]; then

util/weekly_build/03_SetupEnv.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ for compiler in $COMPILERS; do
2323
spack config add "config:install_tree:padded_length:${PADDED_LENGTH:-200}"
2424
# Check for duplicates and fail before doing the "real" concretization:
2525
spack_wrapper log.concretize concretize --fresh
26-
${SPACK_STACK_DIR:?}/util/show_duplicate_packages.py -i crtm-fix -i crtm -i esmf -i mapl
26+
${SPACK_STACK_DIR:?}/util/show_duplicate_packages.py -i crtm-fix -i crtm -i esmf -i mapl -i neptune-env
2727
# The following is not working at the moment, for seemingly a couple reasons. Therefore packages with test-only deps cannot be tested.
2828
# spack concretize --force --fresh --test all | tee log.concretize_test
2929
done

0 commit comments

Comments
 (0)