-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #401 from DUNE-DAQ/johnfreeman/drop_misleading_err…
…or_message JCF: take advantage of the fact that we now have separate scripts for…
- Loading branch information
Showing
2 changed files
with
2 additions
and
20 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters