From b18fd9cd3534b38ead39779d77dcd5b2ee1f1891 Mon Sep 17 00:00:00 2001
From: Jeffery Antoniuk <jeffery.antoniuk@ualberta.ca>
Date: Fri, 17 Jan 2025 17:01:18 -0700
Subject: [PATCH] Tweak auto

---
 docker-bake-leaf-version-override.json |  3 ++-
 docker/drupal/scripts/auto.sh          | 16 ++++++++--------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/docker-bake-leaf-version-override.json b/docker-bake-leaf-version-override.json
index b90b24e..98ba4b4 100644
--- a/docker-bake-leaf-version-override.json
+++ b/docker-bake-leaf-version-override.json
@@ -4,4 +4,5 @@
             "default": "3.0.19"
         }
     }
-}
\ No newline at end of file
+}
+
diff --git a/docker/drupal/scripts/auto.sh b/docker/drupal/scripts/auto.sh
index 852c5a4..fadf1d7 100644
--- a/docker/drupal/scripts/auto.sh
+++ b/docker/drupal/scripts/auto.sh
@@ -52,12 +52,12 @@ function update_leaf_version() {
 
 
 
-BRANCH=$(git branch --show-current)
-if [ "${BRANCH}" != 'main' ]; then
-  echo "Not on the main branch: ${BRANCH}"
-  # git switch main && git pull
-  exit 1
-fi
+#BRANCH=$(git branch --show-current)
+#if [ "${BRANCH}" != 'main' ]; then
+#  echo "Not on the main branch: ${BRANCH}"
+#  # git switch main && git pull
+#  exit 1
+#fi
 
 # Get local LEAF version
 LEAF_VERSION_LOCAL=$(jq -r '.variable.LEAF_VERSION.default' docker-bake-leaf-version-override.json)
@@ -83,9 +83,9 @@ elif [ -z "${LEAF_VERSION_LOCAL}" ]; then
 else
   echo "Starting LEAF version update from ${LEAF_VERSION_LOCAL} to ${LEAF_VERSION}"
   GIT_BRANCH="leaf_update_${LEAF_VERSION}"
-  git checkout -b "leaf_update_${GIT_BRANCH}"
+  git checkout -b "${GIT_BRANCH}"
   update_leaf_version_test ${LEAF_VERSION}
   update_leaf_version ${LEAF_VERSION}
-  # git commit -a -m "Bump LEAF version from ${LEAF_VERSION_LOCAL} to ${LEAF_VERSION}" && git push origin ${GIT_BRANCH}
+  git commit -a -m "Bump LEAF version from ${LEAF_VERSION_LOCAL} to ${LEAF_VERSION}" && git push origin ${GIT_BRANCH}
 fi