feat(upgrade): add beta channel support via script argument

Author: ReturnFI

.github/workflows/build-beta.yml

@@ -1,4 +1,4 @@
-name: Build Beta Version
+name: Build and Deploy Beta Pre-release
 
 on:
   push:
@@ -7,7 +7,7 @@ on:
   workflow_dispatch:
 
 jobs:
-  build-and-package-beta:
+  build-and-release-beta:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout repository
@@ -25,47 +25,42 @@ jobs:
         go mod init hysteria_auth
         go mod tidy
 
-    - name: Build for linux-amd64
-      run: (cd core/scripts/auth && GOOS=linux GOARCH=amd64 go build -o user_auth .)
-
-    - name: Upload amd64 Beta Artifact
-      uses: actions/upload-artifact@v4
-      with:
-        name: Blitz-amd64
-        path: |
-          .
-          !.git/**
-          !.github/**
-          !*.zip
-          !.gitignore
-          !CONTRIBUTING.md
-          !LICENSE
-          !README*.md
-          !SECURITY.md
-          !changelog
-          !core/scripts/auth/go.*
-          !core/scripts/auth/user_auth.go
+    - name: Build and Package for linux-amd64
+      id: package_amd64
+      run: |
+        (cd core/scripts/auth && GOOS=linux GOARCH=amd64 go build -o user_auth .)
+        zip_name="Blitz-amd64.zip"
+        zip -r "$zip_name" . \
+          -x ".git/*" ".github/*" "*.zip" ".gitignore" "CONTRIBUTING.md" \
+             "LICENSE" "README*.md" "SECURITY.md" "changelog" \
+             "core/scripts/auth/go.*" "core/scripts/auth/user_auth.go"
+        rm core/scripts/auth/user_auth
+        echo "zip_name=$zip_name" >> $GITHUB_OUTPUT
 
-    - name: Clean amd64 binary
-      run: rm core/scripts/auth/user_auth
+    - name: Build and Package for linux-arm64
+      id: package_arm64
+      run: |
+        (cd core/scripts/auth && GOOS=linux GOARCH=arm64 go build -o user_auth .)
+        zip_name="Blitz-arm64.zip"
+        zip -r "$zip_name" . \
+          -x ".git/*" ".github/*" "*.zip" ".gitignore" "CONTRIBUTING.md" \
+             "LICENSE" "README*.md" "SECURITY.md" "changelog" \
+             "core/scripts/auth/go.*" "core/scripts/auth/user_auth.go"
+        rm core/scripts/auth/user_auth
+        echo "zip_name=$zip_name" >> $GITHUB_OUTPUT
 
-    - name: Build for linux-arm64
-      run: (cd core/scripts/auth && GOOS=linux GOARCH=arm64 go build -o user_auth .)
+    - name: Get latest commit message for release body
+      id: get_commit_message
+      run: echo "message=$(git log -1 --pretty=format:%s)" >> $GITHUB_OUTPUT
 
-    - name: Upload arm64 Beta Artifact
-      uses: actions/upload-artifact@v4
+    - name: Create Beta GitHub Release
+      uses: softprops/action-gh-release@v2
       with:
-        name: Blitz-arm64
-        path: |
-          .
-          !.git/**
-          !.github/**
-          !*.zip
-          !.gitignore
-          !CONTRIBUTING.md
-          !LICENSE
-          !README*.md
-          !SECURITY.md
-          !changelog
-          !core/scripts/auth/go.*
-          !core/scripts/auth/user_auth.go
+        tag_name: beta
+        name: "Beta Build"
+        body: "Latest beta build. Last commit: ${{ steps.get_commit_message.outputs.message }}"
+        files: |
+          ${{ steps.package_amd64.outputs.zip_name }}
+          ${{ steps.package_arm64.outputs.zip_name }}
+        prerelease: true
+        draft: false

upgrade.sh

@@ -3,13 +3,6 @@
 set -euo pipefail
 trap 'echo -e "\n❌ An error occurred. Aborting."; exit 1' ERR
 
-# ========== Variables ==========
-HYSTERIA_INSTALL_DIR="/etc/hysteria"
-HYSTERIA_VENV_DIR="$HYSTERIA_INSTALL_DIR/hysteria2_venv"
-GEOSITE_URL="https://raw.githubusercontent.com/Chocolate4U/Iran-v2ray-rules/release/geosite.dat"
-GEOIP_URL="https://raw.githubusercontent.com/Chocolate4U/Iran-v2ray-rules/release/geoip.dat"
-MIGRATE_SCRIPT_PATH="$HYSTERIA_INSTALL_DIR/core/scripts/db/migrate_users.py"
-
 # ========== Color Setup ==========
 GREEN=$(tput setaf 2)
 RED=$(tput setaf 1)
@@ -22,6 +15,26 @@ success() { echo -e "${GREEN}[$(date '+%Y-%m-%d %H:%M:%S')] [OK] - ${RESET} $1";
 warn() { echo -e "${YELLOW}[$(date '+%Y-%m-%d %H:%M:%S')] [WARN] - ${RESET} $1"; }
 error() { echo -e "${RED}[$(date '+%Y-%m-%d %H:%M:%S')] [ERROR] - ${RESET} $1"; }
 
+# ========== Variables and Argument Parsing ==========
+echo "Usage: $0 [beta]"
+echo "  (no argument) - Upgrades to the latest stable release."
+echo "  beta          - Upgrades to the latest beta pre-release."
+echo "--------------------------------------------------------"
+
+RELEASE_TAG="beta"
+if [[ "${1:-}" == "beta" ]]; then
+    info "Beta flag detected. Targeting beta pre-release."
+    RELEASE_TAG="beta"
+else
+    info "Targeting the latest stable release."
+fi
+
+HYSTERIA_INSTALL_DIR="/etc/hysteria"
+HYSTERIA_VENV_DIR="$HYSTERIA_INSTALL_DIR/hysteria2_venv"
+GEOSITE_URL="https://raw.githubusercontent.com/Chocolate4U/Iran-v2ray-rules/release/geosite.dat"
+GEOIP_URL="https://raw.githubusercontent.com/Chocolate4U/Iran-v2ray-rules/release/geoip.dat"
+MIGRATE_SCRIPT_PATH="$HYSTERIA_INSTALL_DIR/core/scripts/db/migrate_users.py"
+
 # ========== Check AVX Support ==========
 check_avx_support() {
     info "Checking CPU for AVX support (required for MongoDB)..."
@@ -94,7 +107,7 @@ migrate_json_to_mongo() {
     fi
 }
 
-download_and_extract_latest_release() {
+download_and_extract_release() {
     local arch
     case $(uname -m) in
         x86_64) arch="amd64" ;;
@@ -107,10 +120,10 @@ download_and_extract_latest_release() {
     info "Detected architecture: $arch"
 
     local zip_name="Blitz-${arch}.zip"
-    local download_url="https://github.com/ReturnFI/Blitz/releases/latest/download/${zip_name}"
+    local download_url="https://github.com/ReturnFI/Blitz/releases/download/${RELEASE_TAG}/${zip_name}"
     local temp_zip="/tmp/${zip_name}"
 
-    info "Downloading latest release from ${download_url}..."
+    info "Downloading release from ${download_url}..."
     if ! curl -sL -o "$temp_zip" "$download_url"; then
         error "Failed to download the release asset. Please check the URL and your connection."
         exit 1
@@ -190,7 +203,7 @@ for FILE in "${FILES[@]}"; do
 done
 
 # ========== Download and Replace Installation ==========
-download_and_extract_latest_release
+download_and_extract_release
 
 # ========== Download Geo Data ==========
 info "Downloading geosite.dat and geoip.dat..."