Skip to content

Build: only checkout versions if they exist in repo #13640

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

Merged
rmcdermo merged 1 commit into from
Oct 29, 2024
+12 −7
Merged

Build: only checkout versions if they exist in repo #13640

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
8 changes: 8 additions & 0 deletions Build/Scripts/HYPRE/build_hypre.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,20 @@ echo "Checking for hypre repository..."

if [ -d "$FIREMODELS/hypre" ]; then
echo "Hypre repository exists. Building hypre library."
cd $FIREMODELS/hypre
if [[ "$(git tag -l "v2.32.0")" == "v2.32.0" ]]; then
echo "Checking out v2.32.0"
$(git checkout v2.32.0)
fi
cd $FIREMODELS/hypre/src
export HYPRE_VERSION=$(git describe)
echo "Cleaning hypre repository..."
make distclean
cp $FIREMODELS/fds/Build/Scripts/HYPRE/$CONFMAKE .
./$CONFMAKE
# get back from detached HEAD state
cd $FIREMODELS/hypre
$(git checkout master)
cd $dir
export HYPRE_HOME=$FIREMODELS/libs/hypre/$HYPRE_VERSION
echo "Hypre library:" $FIREMODELS/libs/hypre/$HYPRE_VERSION
Expand Down
11 changes: 4 additions & 7 deletions Build/Scripts/SUNDIALS/build_sundials.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,26 +30,23 @@ echo "Checking for sundials repository..."

if [ -d "$FIREMODELS/sundials" ]; then
echo "Sundials repository exists. Building sundials library."
echo "Checking out version 6.7.0"
cd $FIREMODELS/sundials
$(git checkout v6.7.0)

if [[ "$(git tag -l "v6.7.0")" == "v6.7.0" ]]; then
echo "Checking out v6.7.0"
$(git checkout v6.7.0)
fi
mkdir $FIREMODELS/sundials/BUILDDIR
cd $FIREMODELS/sundials/BUILDDIR

echo "Creating library directry..."
export SUNDIALS_VERSION=$(git describe)
mkdir $FIREMODELS/libs/sundials/$SUNDIALS_VERSION

echo "Cleaning sundials repository..."
rm -r $FIREMODELS/sundials/BUILDDIR/*
cp $FIREMODELS/fds/Build/Scripts/SUNDIALS/$CONFMAKE .
./$CONFMAKE

# get back from detached HEAD state
cd $FIREMODELS/sundials
$(git checkout main)

cd $dir
export SUNDIALS_HOME=$FIREMODELS/libs/sundials/$SUNDIALS_VERSION
echo "Sundials library:" $FIREMODELS/libs/sundials/$SUNDIALS_VERSION
Expand Down