new release

Author: eclipsevortex

README.md

@@ -160,6 +160,8 @@ To upgrade the Auto Upgrader when a new release has been deployed, you can run
 ./scripts/auto_upgrader/auto_upgrader_upgrade.sh
 ```
 
+Use `-h` to see the options
+
 <br />
 
 # 🛠️ Installation <a id="installation"></a>

VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

scripts/auto_upgrader/auto_upgrader_upgrade.sh

@@ -66,7 +66,7 @@ setup_process() {
     echo "⚙️  Setting up for 'process' mode..."
 
     # Upgrade the auto upgrader as process
-    ./subvortex/auto_upgrader/deployment/proecss/auto_upgrader_process_upgrade.sh
+    ./subvortex/auto_upgrader/deployment/process/auto_upgrader_process_upgrade.sh
 
     # Add any other logic specific to process mode here
     echo "✅ Process started."

subvortex/auto_upgrader/deployment/container/auto_upgrader_container_upgrade.sh

@@ -2,10 +2,47 @@
 
 set -e
 
+SERVICE_NAME=auto_upgrader
+
 # Determine script directory dynamically to ensure everything runs in ./scripts/api/
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 cd "$SCRIPT_DIR/../.."
 
+# Track whether we stashed anything
+STASHED=0
+
+# Check for uncommitted changes
+if ! git diff --quiet || ! git diff --cached --quiet; then
+    echo "📦 Stashing local changes..."
+    git stash push -u -m "Auto stash before pull"
+    STASHED=1
+fi
+
+# Check if branch is tracking a remote
+BRANCH=$(git rev-parse --abbrev-ref HEAD)
+UPSTREAM=$(git rev-parse --abbrev-ref "$BRANCH@{upstream}" 2>/dev/null || true)
+
+if [[ -z "$UPSTREAM" ]]; then
+    echo "❌ Branch '$BRANCH' is not tracking any remote branch. Cannot pull safely."
+    exit 1
+fi
+
+# Pull latest changes from upstream
+echo "🔄 Pulling latest changes from $UPSTREAM..."
+if ! git pull --ff-only; then
+    echo "⚠️ Fast-forward pull failed. Trying forced sync with origin/$BRANCH..."
+    git fetch origin
+    git reset --hard origin/"$BRANCH"
+fi
+
+# Restore stashed changes if we made one
+if [[ "$STASHED" -eq 1 ]]; then
+    echo "🧵 Restoring stashed local changes..."
+    git stash pop || {
+        echo "⚠️ Conflicts while restoring stash. You may need to resolve manually."
+    }
+fi
+
 # Load environment variables
 export $(grep -v '^#' .env | xargs)
 

subvortex/auto_upgrader/deployment/process/auto_upgrader_process_upgrade.sh

@@ -8,10 +8,14 @@ SERVICE_NAME=subvortex-auto-upgrader
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 cd "$SCRIPT_DIR/../.."
 
+# Track whether we stashed anything
+STASHED=0
+
 # Check for uncommitted changes
 if ! git diff --quiet || ! git diff --cached --quiet; then
     echo "📦 Stashing local changes..."
     git stash push -u -m "Auto stash before pull"
+    STASHED=1
 fi
 
 # Check if branch is tracking a remote
@@ -25,7 +29,19 @@ fi
 
 # Pull latest changes from upstream
 echo "🔄 Pulling latest changes from $UPSTREAM..."
-git pull --ff-only
+if ! git pull --ff-only; then
+    echo "⚠️ Fast-forward pull failed. Trying forced sync with origin/$BRANCH..."
+    git fetch origin
+    git reset --hard origin/"$BRANCH"
+fi
+
+# Restore stashed changes if we made one
+if [[ "$STASHED" -eq 1 ]]; then
+    echo "🧵 Restoring stashed local changes..."
+    git stash pop || {
+        echo "⚠️ Conflicts while restoring stash. You may need to resolve manually."
+    }
+fi
 
 # Install python if not already done
 if ! command -v python3 &> /dev/null; then
@@ -55,6 +71,7 @@ pip install ".[$SUBVORTEX_EXECUTION_ROLE]"
 # Install SubVortex in Editable Mode
 pip install -e ../../
 
+# Start or restart the process
 if pm2 list | grep -qw "$SERVICE_NAME"; then
     echo "🔄 Restarting PM2 service: $SERVICE_NAME"
     pm2 restart "$SERVICE_NAME"

subvortex/auto_upgrader/deployment/service/auto_upgrader_service_upgrade.sh

@@ -8,10 +8,14 @@ SERVICE_NAME=subvortex-auto-upgrader
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 cd "$SCRIPT_DIR/../.."
 
+# Track whether we stashed anything
+STASHED=0
+
 # Check for uncommitted changes
 if ! git diff --quiet || ! git diff --cached --quiet; then
     echo "📦 Stashing local changes..."
     git stash push -u -m "Auto stash before pull"
+    STASHED=1
 fi
 
 # Check if branch is tracking a remote
@@ -25,7 +29,19 @@ fi
 
 # Pull latest changes from upstream
 echo "🔄 Pulling latest changes from $UPSTREAM..."
-git pull --ff-only
+if ! git pull --ff-only; then
+    echo "⚠️ Fast-forward pull failed. Trying forced sync with origin/$BRANCH..."
+    git fetch origin
+    git reset --hard origin/"$BRANCH"
+fi
+
+# Restore stashed changes if we made one
+if [[ "$STASHED" -eq 1 ]]; then
+    echo "🧵 Restoring stashed local changes..."
+    git stash pop || {
+        echo "⚠️ Conflicts while restoring stash. You may need to resolve manually."
+    }
+fi
 
 # Install python if not already done
 if ! command -v python3 &> /dev/null; then

subvortex/auto_upgrader/entrypoint.sh

@@ -22,7 +22,7 @@ while IFS= read -r line; do
 done < <(env)
 
 if [ $# -eq 0 ]; then
-    python ./subvortex/auto_upgrade/src/main.py \
+    python ./subvortex/auto_upgrader/src/main.py \
     "${ARGS[@]}"
 else
     exec "$@"

subvortex/auto_upgrader/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "subvortex-auto-upgrader"
-version = "0.0.1"
+version = "0.0.2"
 description = "SubVortex Auto Upgrader"
 authors = [{ name = "Eclipse Vortex", email = "subvortex.bt@gmail.com" }]
 readme = "README.md"

subvortex/version.py

@@ -1 +1 @@
-__version__ = "0.0.1"
+__version__ = "0.0.2"