From cd178a1a9dbf36c1610674b0a71283d2fd0e1592 Mon Sep 17 00:00:00 2001 From: lxh2875931338 Date: Wed, 29 Jul 2026 23:23:25 +0800 Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E7=BD=B2=E9=80=BB=E8=BE=91=E5=AD=98?= =?UTF-8?q?=E5=9C=A8=E8=B0=83=E6=95=B4=EF=BC=8C=E4=B8=8Etest=E7=AB=AF?= =?UTF-8?q?=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- deploy.sh | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/deploy.sh b/deploy.sh index 955593a..d796bcb 100644 --- a/deploy.sh +++ b/deploy.sh @@ -165,14 +165,20 @@ check_container() { # ---------- 版本管理函数 ---------- -read_version_file() { - local version_file="./version.ini" - if [ ! -f "$version_file" ]; then - print_error "version.ini 文件不存在: $version_file" +# 直接从远程仓库读取 version.ini +read_version_from_remote() { + local branch="$1" + local version_url="https://git.whitetop.xyz/lxh2875931338/frpc-console/raw/${branch}/version.ini" + + local content + content=$(curl -sSL "$version_url" 2>/dev/null) + if [ -z "$content" ]; then + print_error "无法从远程读取 version.ini: $version_url" return 1 fi - SEMVER=$(grep -v "^[;#]" "$version_file" | head -1 | awk '{print $1}') - LTS_DATE=$(grep -v "^[;#]" "$version_file" | head -1 | awk '{print $2}') + + SEMVER=$(echo "$content" | grep -v "^[;#]" | head -1 | awk '{print $1}') + LTS_DATE=$(echo "$content" | grep -v "^[;#]" | head -1 | awk '{print $2}') echo "$SEMVER $LTS_DATE" } @@ -188,8 +194,15 @@ get_version_type() { generate_target_version() { local channel="$1" + local branch="${2:-$BRANCH}" + local semver_lts_date - semver_lts_date=$(read_version_file) + semver_lts_date=$(read_version_from_remote "$branch") + if [ $? -ne 0 ] || [ -z "$semver_lts_date" ]; then + print_error "读取版本信息失败" + exit 1 + fi + SEMVER=$(echo "$semver_lts_date" | awk '{print $1}') LTS_DATE=$(echo "$semver_lts_date" | awk '{print $2}') @@ -678,7 +691,8 @@ main() { select_channel - generate_target_version "$CHANNEL" + # 直接从远程仓库读取版本信息,不依赖本地文件 + generate_target_version "$CHANNEL" "$BRANCH" if [ "$CONTAINER_EXISTS" = true ]; then CURRENT_VERSION=$(get_current_version)