updates ..

scripts/deploy_cloud_app.sh

@@ -1,50 +1,114 @@
 #!/bin/bash
 set -e
 
-# Get current branch name
+SCRIPT_PATH=$(realpath "$(dirname $(realpath "${BASH_SOURCE[0]}"))")
-CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD)
+source ${SCRIPT_PATH}/build_utils.sh
 
+function show_help() {
+  echo "Usage: $0 [options]"
+  echo "Options:"
+  echo "  -b, --branch <branch>    Checkout branch"
+  echo "      --set-as-default     Set as default"
+  echo "      --skip-confirmation  Skip confirmation"
+  echo "  --help                   Show help"
+}
+
+# Parse command line arguments
+CHECKOUT_BRANCH=
+SET_AS_DEFAULT=false
+SKIP_CONFIRMATION=false
+while [[ $# -gt 0 ]]; do
+  case $1 in
+    -b|--branch)
+      CHECKOUT_BRANCH="$2"
+      shift 2
+    ;;
+    --set-as-default)
+      SET_AS_DEFAULT=true
+      shift
+    ;;
+    --skip-confirmation)
+      SKIP_CONFIRMATION=true
+      shift
+    ;;
+    --help)
+      show_help
+      exit 0
+    ;;
+    *)
+      echo "Unknown option: $1"
+      show_help
+      exit 1
+    ;;
+  esac
+done
+
+
+# Checkout current branch in a new temporary directory
+# only popd when exiting the script
+TMP_DIR=$(mktemp -d)
+trap 'popd > /dev/null && rm -rf ${TMP_DIR}' EXIT
+msg_info "Copying repository to a new temporary directory ${TMP_DIR} ..."
+git fetch origin ${CHECKOUT_BRANCH}:${CHECKOUT_BRANCH}
+git clone . ${TMP_DIR}
+cp ${SCRIPT_PATH}/versioned.patch ${TMP_DIR}
+msg_info "Checking out branch ${CHECKOUT_BRANCH} ..."
+pushd ${TMP_DIR} > /dev/null
+git checkout ${CHECKOUT_BRANCH}
+
+
+CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD)
 # Verify branch name matches release/x.x.x or release/x.x.x-dev...
-if [[ ! $CURRENT_BRANCH =~ ^release/[0-9]+\.[0-9]+\.[0-9]+(-dev[0-9]+)?$ ]]; then
+if [[ ! $CURRENT_BRANCH =~ ^(release|release-cloud-app)/[0-9]+\.[0-9]+\.[0-9]+(-dev[0-9]+)?$ ]]; then
-  echo "✗ Error: Current branch '$CURRENT_BRANCH' does not match required pattern"
+  msg_err "Current branch '$CURRENT_BRANCH' does not match required pattern"
-  echo "  Expected: release/x.x.x OR release/x.x.x-dev20241104123632"
+  msg_err "Expected: release/x.x.x OR release/x.x.x-dev20241104123632"
   exit 1
 fi
 
-# Extract version from branch name (remove "release/" prefix)
+GIT_COMMIT=$(git rev-parse HEAD)
+BUILD_TIMESTAMP=$(date -u +%FT%T%z)
 VERSION=${CURRENT_BRANCH#release/}
-
+VERSION=${VERSION#release-cloud-app/}
-echo "Current branch: $CURRENT_BRANCH"
+if [[ ! $VERSION =~ ^[0-9]+\.[0-9]+\.[0-9]+(-dev[0-9]+)?$ ]]; then
-echo "Version: $VERSION"
+  msg_err "Version '$VERSION' does not match required pattern"
-echo ""
+  msg_err "Expected: x.x.x OR x.x.x-dev20241104123632"
+  exit 1
+fi
 
 # Change to ui directory
 cd ui
 
-# Ask for confirmation
+if [ "$SET_AS_DEFAULT" = true ]; then
-read -p "Do you want to deploy the cloud app to production? (y/N): " -n 1 -r
+  # Build for root dist
-echo ""
+  msg_info "Building for root dist..."
-if [[ ! $REPLY =~ ^[Yy]$ ]]; then
+  npm ci
-  echo "Deployment cancelled."
+  npm run build:prod
-  exit 0
 fi
 
-# Build for root dist
-echo ""
-echo "Building for root dist..."
-npm ci
-npm run build:prod
-
 # Build for versioned dist/v/VERSION
-echo ""
+msg_info "Building for dist/v/${VERSION}..."
-echo "Building for dist/v/${VERSION}..."
 npm ci
 npm run build:prod -- --base=/v/${VERSION}/ --outDir dist/v/${VERSION}
 
-# Deploy to production
+# Ask for confirmation
+if [ "$SKIP_CONFIRMATION" = false ]; then
+read -p "Do you want to deploy the cloud app to production? (y/N): " -n 1 -r
 echo ""
-echo "Deploying to r2://jetkvm-cloud-app..."
+  if [[ ! $REPLY =~ ^[Yy]$ ]]; then
-rclone copyto dist r2://jetkvm-cloud-app
+    msg_err "Deployment cancelled."
+    exit 0
+  fi
+fi
 
-echo ""
+# Deploy to production
-echo "✓ Successfully deployed v${VERSION} to production"
+msg_info "Deploying to r2://jetkvm-cloud-app..."
+rclone copyto \
+  --progress \
+  --stats=1s \
+  --header-upload="x-amz-meta-jetkvm-version: ${VERSION}" \
+  --header-upload="x-amz-meta-jetkvm-build-ref: ${GIT_COMMIT}" \
+  --header-upload="x-amz-meta-jetkvm-build-timestamp: ${BUILD_TIMESTAMP}" \
+  dist \
+r2://jetkvm-cloud-app
+
+msg_ok "Successfully deployed v${VERSION} to production"