Skip to content

Commit

Permalink
Merge pull request #401 from DUNE-DAQ/johnfreeman/drop_misleading_err…
Browse files Browse the repository at this point in the history
…or_message

JCF: take advantage of the fact that we now have separate scripts for…
  • Loading branch information
jcfreeman2 authored Oct 28, 2024
2 parents 75246a0 + 09fbdd5 commit b9f7127
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 20 deletions.
19 changes: 0 additions & 19 deletions scripts/spack/build-release-v4.sh
Original file line number Diff line number Diff line change
Expand Up @@ -96,27 +96,8 @@ if [[ $retval != 0 ]]; then
exit 20
fi

build_dbe=false
if [[ $DET == "core" ]]; then
spack spec -l --reuse dbe%[email protected] build_type=RelWithDebInfo arch=linux-${OS}-x86_64 > $SPACK_AREA/spec_dbe_log.txt 2>&1
retval=$?

cat $SPACK_AREA/spec_dbe_log.txt

if [[ $retval == 0 ]]; then
build_dbe=true
else
build_dbe=false
echo "Building dbe does not appear to be possible. As this is not (necessarily) an error, will continue..."
fi
fi

spack install --reuse ${DET}daq@${RELEASE_TAG}%[email protected] build_type=RelWithDebInfo arch=linux-${OS}-x86_64 || exit 7

if $build_dbe; then
spack install --reuse dbe%[email protected] build_type=RelWithDebInfo arch=linux-${OS}-x86_64 || exit 8
fi

if [[ "$DET" == "fd" || "$DET" == "nd" ]]; then
# Generate pyvenv_requirements.txt
spack load ${DET}daq@${RELEASE_TAG} || exit 9
Expand Down
3 changes: 2 additions & 1 deletion scripts/spack/build-release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,8 @@ if [[ $DET == "core" ]]; then
build_dbe=true
else
build_dbe=false
echo "Building dbe does not appear to be possible. As this is not (necessarily) an error, will continue..."
echo "Building dbe does not appear to be possible. Will exit..."
exit 12
fi
fi

Expand Down

0 comments on commit b9f7127

Please sign in to comment.