From e035d5105edd395d8f99153339aaafa9d4d50d34 Mon Sep 17 00:00:00 2001
From: liyi <m18269109817@163.com>
Date: Fri, 16 May 2025 17:39:53 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E8=B0=83=E6=95=B4tag=E8=A7=A6=E5=8F=91?=
 =?UTF-8?q?=E6=9E=84=E5=BB=BA=E7=9A=84=E6=AD=A3=E5=88=99=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 android/build.sh | 15 ++++++++++-----
 ios/build.sh     | 10 +++++++---
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/android/build.sh b/android/build.sh
index f444cb1e..e002bba7 100755
--- a/android/build.sh
+++ b/android/build.sh
@@ -8,7 +8,7 @@ export ENV_BUILD_WORKSPACE=${CI_PROJECT_DIR}
 echo "GITLAB_WORKSPACE: ${CI_PROJECT_DIR}"
 cd ${CI_PROJECT_DIR}/android
 echo "ENV_BUILD_TAG:${ENV_BUILD_TAG},ENV_BUILD_BRANCH:${ENV_BUILD_BRANCH}"
-regex='^v[0-9]+\.[0-9]+\.[0-9]+(-[a-zA-Z]+\.[0-9]+)?$'
+regex='^(sky_)?v[0-9]+\.[0-9]+\.[0-9]+(-[a-zA-Z]+\.[0-9]+)?$'
 if [[ "${ENV_BUILD_BRANCH}" == "canary_release" ]]; then
     echo "===build canary_release: ${NEXT_VERSION}"
     export ENV_BUILD_TAG=${NEXT_VERSION}
@@ -16,10 +16,15 @@ if [[ "${ENV_BUILD_BRANCH}" == "canary_release" ]]; then
     bundle exec fastlane release_apk flavor:sky --verbose
 elif [[ $ENV_BUILD_TAG =~ $regex ]]; then
     echo "===build release===$ENV_BUILD_TAG"
-    bundle exec fastlane release_apk flavor:xhj --verbose
-    bundle exec fastlane release_apk flavor:sky --verbose
-    bundle exec fastlane release_bundle flavor:xhj_bundle --verbose
-    bundle exec fastlane release_bundle flavor:sky --verbose
+    if [[ "${ENV_BUILD_TAG}" =~ ^sky_ ]]; then
+        bundle exec fastlane release_apk flavor:sky --verbose
+        bundle exec fastlane release_bundle flavor:sky --verbose
+    else
+        bundle exec fastlane release_apk flavor:xhj --verbose
+        bundle exec fastlane release_apk flavor:sky --verbose
+        bundle exec fastlane release_bundle flavor:xhj_bundle --verbose
+        bundle exec fastlane release_bundle flavor:sky --verbose
+    fi
 elif [[ "${ENV_BUILD_BRANCH}" == "develop" ]]; then
     echo "===build dev===${NEXT_VERSION}"
     bundle exec fastlane beta flavor:xhj env:dev --verbose
diff --git a/ios/build.sh b/ios/build.sh
index b492d623..dbcc67d2 100755
--- a/ios/build.sh
+++ b/ios/build.sh
@@ -9,7 +9,7 @@ echo "GITLAB_WORKSPACE: ${CI_PROJECT_DIR}"
 cd ${CI_PROJECT_DIR}/ios
 #bundle exec pod install
 echo "ENV_BUILD_TAG:${ENV_BUILD_TAG},ENV_BUILD_BRANCH:${ENV_BUILD_BRANCH}"
-regex='^v[0-9]+\.[0-9]+\.[0-9]+(-[a-zA-Z]+\.[0-9]+)?$'
+regex='^(sky_)?v[0-9]+\.[0-9]+\.[0-9]+(-[a-zA-Z]+\.[0-9]+)?$'
 
 # ==== 调试输出，确认环境和依赖 ====
 echo "=== FASTLANE/GEM/ENV DEBUG ==="
@@ -29,8 +29,12 @@ if [[ "${ENV_BUILD_BRANCH}" == "canary_release" ]]; then
     bundle exec fastlane release_ipa flavor:sky --verbose
 elif [[ $ENV_BUILD_TAG =~ $regex ]]; then
     echo "===build release===$ENV_BUILD_TAG"
-    bundle exec fastlane release_ipa flavor:xhj --verbose
-    bundle exec fastlane release_ipa flavor:sky --verbose
+    if [[ "${ENV_BUILD_TAG}" =~ ^sky_ ]]; then
+        bundle exec fastlane release_ipa flavor:sky --verbose
+    else
+        bundle exec fastlane release_ipa flavor:xhj --verbose
+        bundle exec fastlane release_ipa flavor:sky --verbose
+    fi
 elif [[ "${ENV_BUILD_BRANCH}" == "develop" ]]; then
     echo "===build dev===${NEXT_VERSION}"
     bundle exec fastlane beta flavor:xhj env:Dev --verbose