Merge pull request #13640 from rmcdermo/master

Build: only checkout versions if they exist in repo

Author: rmcdermo

Build/Scripts/HYPRE/build_hypre.sh

@@ -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

Build/Scripts/SUNDIALS/build_sundials.sh

@@ -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