From 8fd0a5243e743ad4b34e2f215c2d4eb08948a9b0 Mon Sep 17 00:00:00 2001 From: liyi Date: Thu, 25 Sep 2025 10:57:01 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=B5=8B=E8=AF=95ci?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/ci.yml | 44 ++++++++++++++--------------------------- 1 file changed, 15 insertions(+), 29 deletions(-) diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index d32e7074..fbe7327e 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -18,7 +18,7 @@ jobs: - name: Checkout Code uses: actions/checkout@v4 with: - fetch-depth: 0 + fetch-depth: 1 # 2. 提取版本号 - name: Extract Version @@ -89,15 +89,10 @@ jobs: echo "🏷️ Next tag: $NEXT_TAG" echo "📈 Increment count: $INCREMENT_COUNT" - # 输出到Gitea Actions环境变量和输出变量 - echo "NEXT_VERSION=$NEXT_VERSION" >> $GITEA_ENV - echo "NEXT_TAG=$NEXT_TAG" >> $GITEA_ENV - echo "INCREMENT_COUNT=$INCREMENT_COUNT" >> $GITEA_ENV - - # 设置输出变量供后续任务使用 - echo "::set-output name=NEXT_VERSION::$NEXT_VERSION" - echo "::set-output name=NEXT_TAG::$NEXT_TAG" - echo "::set-output name=INCREMENT_COUNT::$INCREMENT_COUNT" + # 设置输出变量供后续任务使用（Gitea Actions格式） + echo "NEXT_VERSION=$NEXT_VERSION" >> $GITEA_OUTPUT + echo "NEXT_TAG=$NEXT_TAG" >> $GITEA_OUTPUT + echo "INCREMENT_COUNT=$INCREMENT_COUNT" >> $GITEA_OUTPUT # 输出版本信息 echo "✅ Version extraction completed" @@ -122,7 +117,7 @@ jobs: - name: Checkout Code uses: actions/checkout@v4 with: - fetch-depth: 0 + fetch-depth: 1 # 4. 构建APK文件 - name: Build APK run: | @@ -134,15 +129,14 @@ jobs: # 获取版本信息（从basic-setup任务传递） echo "🔍 Getting version info from basic-setup job..." - echo "NEXT_VERSION: ${{ needs.basic-setup.outputs.NEXT_VERSION }}" # 设置默认版本号，如果环境变量为空 - if [ -z "${{ needs.basic-setup.outputs.NEXT_VERSION }}" ]; then + if [ -z "$NEXT_VERSION" ]; then VERSION_FOR_FILENAME="1-0-0" echo "⚠️ Version not found, using default: $VERSION_FOR_FILENAME" else # 格式化版本号用于文件名 - VERSION_FOR_FILENAME=$(echo "${{ needs.basic-setup.outputs.NEXT_VERSION }}" | sed 's/v//g' | sed 's/\./-/g') + VERSION_FOR_FILENAME=$(echo "$NEXT_VERSION" | sed 's/v//g' | sed 's/\./-/g') echo "✅ Version found: $VERSION_FOR_FILENAME" fi @@ -169,15 +163,14 @@ jobs: # 获取版本信息（从basic-setup任务传递） echo "🔍 Getting version info from basic-setup job..." - echo "NEXT_VERSION: ${{ needs.basic-setup.outputs.NEXT_VERSION }}" # 设置默认版本号，如果环境变量为空 - if [ -z "${{ needs.basic-setup.outputs.NEXT_VERSION }}" ]; then + if [ -z "$NEXT_VERSION" ]; then VERSION_FOR_FILENAME="1-0-0" echo "⚠️ Version not found, using default: $VERSION_FOR_FILENAME" else # 格式化版本号用于文件名 - VERSION_FOR_FILENAME=$(echo "${{ needs.basic-setup.outputs.NEXT_VERSION }}" | sed 's/v//g' | sed 's/\./-/g') + VERSION_FOR_FILENAME=$(echo "$NEXT_VERSION" | sed 's/v//g' | sed 's/\./-/g') echo "✅ Version found: $VERSION_FOR_FILENAME" fi @@ -205,15 +198,14 @@ jobs: # 获取版本信息（从basic-setup任务传递） echo "🔍 Getting version info from basic-setup job..." - echo "NEXT_VERSION: ${{ needs.basic-setup.outputs.NEXT_VERSION }}" # 设置默认版本号，如果环境变量为空 - if [ -z "${{ needs.basic-setup.outputs.NEXT_VERSION }}" ]; then + if [ -z "$NEXT_VERSION" ]; then VERSION_FOR_FILENAME="1-0-0" echo "⚠️ Version not found, using default: $VERSION_FOR_FILENAME" else # 格式化版本号用于文件名 - VERSION_FOR_FILENAME=$(echo "${{ needs.basic-setup.outputs.NEXT_VERSION }}" | sed 's/v//g' | sed 's/\./-/g') + VERSION_FOR_FILENAME=$(echo "$NEXT_VERSION" | sed 's/v//g' | sed 's/\./-/g') echo "✅ Version found: $VERSION_FOR_FILENAME" fi @@ -223,15 +215,9 @@ jobs: # 配置iOS自动签名（CI环境使用自动签名） echo "🔧 Configuring iOS automatic code signing for CI environment..." - cd ios - # 设置自动签名 - /usr/libexec/PlistBuddy -c "Set :CODE_SIGN_STYLE Automatic" Runner.xcodeproj/project.pbxproj - /usr/libexec/PlistBuddy -c "Delete :PROVISIONING_PROFILE_SPECIFIER" Runner.xcodeproj/project.pbxproj - /usr/libexec/PlistBuddy -c "Delete :PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" Runner.xcodeproj/project.pbxproj - cd .. - # 构建iOS IPA，使用新的构建参数和自动签名 - flutter build ipa --no-tree-shake-icons --release --flavor sky -t lib/main_sky_full.dart --build-number=$BUILD_NUMBER --build-name="sky-star-lock-release-$VERSION_FOR_FILENAME.ipa" + # 构建iOS IPA，使用自动签名模式 + flutter build ipa --no-tree-shake-icons --release --flavor sky -t lib/main_sky_full.dart --build-number=$BUILD_NUMBER --build-name="sky-star-lock-release-$VERSION_FOR_FILENAME.ipa" --codesign="auto" # 重命名IPA文件 mv build/ios/ipa/*.ipa "$IPA_FILENAME" @@ -261,5 +247,5 @@ jobs: echo " ✅ IPA: sky-star-lock-release-*.ipa" fi echo "" - echo "🏷️ Version: ${{ env.NEXT_VERSION }}" + echo "🏷️ Version: $NEXT_VERSION" echo "📁 Files available in artifacts section" -- 2.47.1