File tree Expand file tree Collapse file tree 1 file changed +3
-2
lines changed Expand file tree Collapse file tree 1 file changed +3
-2
lines changed Original file line number Diff line number Diff line change @@ -46,6 +46,7 @@ ARG ENV=xl
4646ENV SPACK_ENV=/opt/spack-environment/${ENV}
4747ARG SPACK_FLAGS="--backtrace"
4848ARG SPACK_INSTALL_FLAGS="--no-check-signature --show-log-on-error --yes-to-all"
49+ ARG SPACK_DUPLICATE_ALLOWLIST="epic|llvm|py-setuptools|py-urllib3|py-dask|py-dask-awkward|py-dask-histogram|py-distributed|py-requests"
4950ENV SPACK_COLOR="always"
5051ENV GIT_TERMINAL_PROMPT=0
5152
@@ -57,7 +58,7 @@ spack external find --not-buildable --scope env:${SPACK_ENV} --path /usr/local/c
5758spack external find --scope env:${SPACK_ENV} llvm
5859spack concretize --force
5960spack --color=never find --long --no-groups --show-concretized --format "{name}" \
60- | uniq -D -f2 | grep -v -w -e " \( epic \| llvm \| py-setuptools \| py-urllib3 \ ) " \
61+ | uniq -D -f2 | grep -Evw "(${SPACK_DUPLICATE_ALLOWLIST} )" \
6162| tee /tmp/duplicates.txt
6263if [ -s /tmp/duplicates.txt ] ; then
6364 echo "Duplicate packages found"
@@ -193,7 +194,7 @@ if [ "${JUGGLER_VERSION}" != "df87bf1f8643afa8e80bece9d36d6dc26dfe8132" ] ; then
193194fi
194195spack concretize --force
195196spack --color=never find --long --no-groups --show-concretized --format "{name}" \
196- | uniq -D -f2 | grep -v -w -e " \( epic \| llvm \| py-setuptools \| py-urllib3 \ ) " \
197+ | uniq -D -f2 | grep -Evw "(${SPACK_DUPLICATE_ALLOWLIST} )" \
197198| tee /tmp/duplicates.txt
198199if [ -s /tmp/duplicates.txt ] ; then
199200 echo "Duplicate packages found"
You can’t perform that action at this time.
0 commit comments