Tweak auto

cwrc · Jan 18, 2025 · b18fd9c · b18fd9c
1 parent 8b52af8
commit b18fd9c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/docker-bake-leaf-version-override.json b/docker-bake-leaf-version-override.json
@@ -4,4 +4,5 @@
             "default": "3.0.19"
         }
     }
-}
+}
+
diff --git 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
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,4 +4,5 @@ @@
                 "default": "3.0.19"
             }
         }
-    }
+    }