部署逻辑存在调整,与test端同步
This commit is contained in:
@@ -165,14 +165,20 @@ check_container() {
|
|||||||
|
|
||||||
# ---------- 版本管理函数 ----------
|
# ---------- 版本管理函数 ----------
|
||||||
|
|
||||||
read_version_file() {
|
# 直接从远程仓库读取 version.ini
|
||||||
local version_file="./version.ini"
|
read_version_from_remote() {
|
||||||
if [ ! -f "$version_file" ]; then
|
local branch="$1"
|
||||||
print_error "version.ini 文件不存在: $version_file"
|
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
|
return 1
|
||||||
fi
|
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"
|
echo "$SEMVER $LTS_DATE"
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -188,8 +194,15 @@ get_version_type() {
|
|||||||
|
|
||||||
generate_target_version() {
|
generate_target_version() {
|
||||||
local channel="$1"
|
local channel="$1"
|
||||||
|
local branch="${2:-$BRANCH}"
|
||||||
|
|
||||||
local semver_lts_date
|
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}')
|
SEMVER=$(echo "$semver_lts_date" | awk '{print $1}')
|
||||||
LTS_DATE=$(echo "$semver_lts_date" | awk '{print $2}')
|
LTS_DATE=$(echo "$semver_lts_date" | awk '{print $2}')
|
||||||
|
|
||||||
@@ -678,7 +691,8 @@ main() {
|
|||||||
|
|
||||||
select_channel
|
select_channel
|
||||||
|
|
||||||
generate_target_version "$CHANNEL"
|
# 直接从远程仓库读取版本信息,不依赖本地文件
|
||||||
|
generate_target_version "$CHANNEL" "$BRANCH"
|
||||||
|
|
||||||
if [ "$CONTAINER_EXISTS" = true ]; then
|
if [ "$CONTAINER_EXISTS" = true ]; then
|
||||||
CURRENT_VERSION=$(get_current_version)
|
CURRENT_VERSION=$(get_current_version)
|
||||||
|
|||||||
Reference in New Issue
Block a user