Skip to content

Commit 5d609e5

Browse files
authored
Merge pull request #13639 from rmcdermo/master
Build: checkout v6.7.0 of sundials during build
2 parents 75f14b6 + 2a25ea8 commit 5d609e5

File tree

1 file changed

+9
-1
lines changed

1 file changed

+9
-1
lines changed

Build/Scripts/SUNDIALS/build_sundials.sh

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,10 @@ echo "Checking for sundials repository..."
3030

3131
if [ -d "$FIREMODELS/sundials" ]; then
3232
echo "Sundials repository exists. Building sundials library."
33+
echo "Checking out version 6.7.0"
34+
cd $FIREMODELS/sundials
35+
$(git checkout v6.7.0)
36+
3337
mkdir $FIREMODELS/sundials/BUILDDIR
3438
cd $FIREMODELS/sundials/BUILDDIR
3539

@@ -38,10 +42,14 @@ if [ -d "$FIREMODELS/sundials" ]; then
3842
mkdir $FIREMODELS/libs/sundials/$SUNDIALS_VERSION
3943

4044
echo "Cleaning sundials repository..."
41-
rm -r *
45+
rm -r $FIREMODELS/sundials/BUILDDIR/*
4246
cp $FIREMODELS/fds/Build/Scripts/SUNDIALS/$CONFMAKE .
4347
./$CONFMAKE
4448

49+
# get back from detached HEAD state
50+
cd $FIREMODELS/sundials
51+
$(git checkout main)
52+
4553
cd $dir
4654
export SUNDIALS_HOME=$FIREMODELS/libs/sundials/$SUNDIALS_VERSION
4755
echo "Sundials library:" $FIREMODELS/libs/sundials/$SUNDIALS_VERSION

0 commit comments

Comments
 (0)