Skip to content

Commit 0898cef

Browse files
committed
Add ip to exempt list for check_duplicate_packages.py
1 parent 089a301 commit 0898cef

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

.github/workflows/ubuntu-ci-x86_64-gnu.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ jobs:
112112
113113
# Concretize and check for duplicates
114114
spack concretize --force --fresh 2>&1 | tee log.concretize.${ENVNAME}
115-
${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
115+
${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
116116
117117
# Add and update source cache
118118
spack mirror add local-source file://${SOURCE_CACHE_PATH}/
@@ -190,7 +190,7 @@ jobs:
190190
191191
# Concretize and check for duplicates
192192
spack concretize --force 2>&1 | tee log.concretize.${ENVNAME}
193-
${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
193+
${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
194194
195195
# Add binary cache back in
196196
spack mirror add local-binary file://${BUILD_CACHE_PATH}/

.github/workflows/ubuntu-ci-x86_64-oneapi-ifx.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ jobs:
128128
129129
# Concretize and check for duplicates
130130
spack concretize --force --fresh 2>&1 | tee log.concretize.${ENVNAME}
131-
${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
131+
${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
132132
133133
# Add and update source cache
134134
spack mirror add local-source file://${SOURCE_CACHE_PATH}/
@@ -209,7 +209,7 @@ jobs:
209209
210210
# Concretize and check for duplicates
211211
spack concretize --force 2>&1 | tee log.concretize.${ENVNAME}
212-
${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
212+
${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
213213
214214
# Add binary cache back in
215215
spack mirror add local-binary file://${BUILD_CACHE_PATH}/

.github/workflows/ubuntu-ci-x86_64-oneapi.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ jobs:
128128
129129
# Concretize and check for duplicates
130130
spack concretize --force --fresh 2>&1 | tee log.concretize.${ENVNAME}
131-
${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
131+
${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
132132
133133
# Add and update source cache
134134
spack mirror add local-source file://${SOURCE_CACHE_PATH}/
@@ -209,7 +209,7 @@ jobs:
209209
210210
# Concretize and check for duplicates
211211
spack concretize --force 2>&1 | tee log.concretize.${ENVNAME}
212-
${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
212+
${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
213213
214214
# Add binary cache back in
215215
spack mirror add local-binary file://${BUILD_CACHE_PATH}/

util/nrl/batch_install.sh

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

531531
# Check for duplicate packages
532-
./util/show_duplicate_packages.py -i crtm -i crtm-fix -i esmf -i mapl -i neptune-env -i py-cython
532+
./util/show_duplicate_packages.py -i crtm -i crtm-fix -i esmf -i mapl -i neptune-env -i py-cython -i ip
533533

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

0 commit comments

Comments
 (0)