Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

JCF: take advantage of the fact that we now have separate scripts for… #401

Merged
merged 1 commit into from
Oct 28, 2024
Merged

JCF: take advantage of the fact that we now have separate scripts for… #401

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 0 additions & 19 deletions scripts/spack/build-release-v4.sh
View file
Open in desktop
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
View file
Open in desktop
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