refactor: ci流程[skip ci] (#365)

linrongda · web-flow · commit 00ad0de53b81 · 2026-03-09T15:20:02.000+08:00
* refactor: ci

* fix: 规范性修正
diff --git a/.github/workflows/alpha.yml b/.github/workflows/alpha.yml
@@ -10,10 +10,8 @@ jobs:
       contents: write
 
     steps:
-      - name: Checkout source code
-        uses: actions/checkout@v4
-
-      - uses: actions/download-artifact@v4
+      - name: Download Artifacts
+        uses: actions/download-artifact@v8
         with:
           name: outputs
           path: ${{ github.workspace }}/outputs/
@@ -29,15 +27,15 @@ jobs:
             cat $GITHUB_WORKSPACE/outputs/changelog
             echo "BSEOF"
           } >> "$GITHUB_OUTPUT"
-          APK_FILENAME="FzuHelper_${APP_VERSION_NAME}(${APP_VERSION_CODE}).apk"
-          echo "apk_filename=$APK_FILENAME" >> "$GITHUB_OUTPUT"
+          APK_FILENAME="FzuHelper_${APP_VERSION_NAME}.${APP_VERSION_CODE}.apk"
+          echo "APK_FILENAME=$APK_FILENAME" >> "$GITHUB_OUTPUT"
           mv $GITHUB_WORKSPACE/outputs/apk/release/app-arm64-v8a-release.apk $APK_FILENAME
 
-      - name: Delete alpha using GitHub CLI
+      - name: Delete alpha by GitHub CLI
         run: |
           gh release delete alpha --yes --cleanup-tag >/dev/null 2>&1 || echo "No alpha release exists."
         env:
-          GITHUB_TOKEN: ${{ github.token }}
+          GH_TOKEN: ${{ github.token }}
 
       - name: Create GitHub Pre-Release
         uses: softprops/action-gh-release@v2
@@ -50,4 +48,4 @@ jobs:
             此版本为新架构测试版，请提前加入内测群 1020036141 了解详情
           prerelease: true
           files: |
-            ${{ steps.version-info.outputs.apk_filename }}
+            ${{ steps.version-info.outputs.APK_FILENAME }}
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -9,13 +9,13 @@ jobs:
     timeout-minutes: 60
 
     steps:
-      - name: Checkout source code
-        uses: actions/checkout@v4
+      - name: Checkout Source Code
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
 
       - name: Restore Cache
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         with:
           path: |
             ${{ github.workspace }}/node_modules
@@ -24,22 +24,23 @@ jobs:
             ${{ runner.os }}-
 
       - name: Setup Node.js
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version: 22
           cache: yarn
 
-      - uses: actions/setup-java@v4
+      - name: Setup Java
+        uses: actions/setup-java@v5
         with:
           distribution: temurin
           java-version: 17
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v4
+        uses: gradle/actions/setup-gradle@v5
         with:
           cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
 
-      - name: Install dependencies
+      - name: Install Dependencies
         run: yarn install --frozen-lockfile --prefer-offline
 
       - name: Prebuild
@@ -65,8 +66,8 @@ jobs:
           echo "$(grep 'versionName' android/app/build.gradle | awk -F '"' '{print $2}')" > android/app/build/outputs/version-name
           echo "$(git log -3 --pretty=format:"%s%n%b%n")" > android/app/build/outputs/changelog
 
-      - name: Upload outputs
-        uses: actions/upload-artifact@v4
+      - name: Upload Artifacts
+        uses: actions/upload-artifact@v7
         with:
           name: outputs
           path: android/app/build/outputs
diff --git a/.github/workflows/beta.yml b/.github/workflows/beta.yml
@@ -9,22 +9,34 @@ jobs:
     environment: beta
 
     steps:
-      - uses: actions/download-artifact@v4
-        with:
-          name: outputs
-          path: ${{ github.workspace }}/outputs/
-
-      - name: Extract Version Info
+      - name: Download APK and Extract Version Info
         id: version-info
         shell: bash
         run: |
-          echo "APP_VERSION_CODE=$(cat $GITHUB_WORKSPACE/outputs/version-code)" >> "$GITHUB_OUTPUT"
-          echo "APP_VERSION_NAME=$(cat $GITHUB_WORKSPACE/outputs/version-name)" >> "$GITHUB_OUTPUT"
+          mkdir -p "$GITHUB_WORKSPACE/outputs/apk/release"
+          gh release download alpha --pattern "FzuHelper_*.apk" --dir "$GITHUB_WORKSPACE/outputs/apk/release"
+
+          APK_PATH=$(ls "$GITHUB_WORKSPACE"/outputs/apk/release/FzuHelper_*.apk | head -n 1)
+          APK_FILENAME=$(basename "$APK_PATH")
+          if [[ "$APK_FILENAME" =~ ^FzuHelper_([0-9]+\.[0-9]+\.[0-9]+)\.([0-9]+)\.apk$ ]]; then
+            APP_VERSION_NAME="${BASH_REMATCH[1]}"
+            APP_VERSION_CODE="${BASH_REMATCH[2]}"
+          else
+            echo "Unexpected APK filename format: $APK_FILENAME"
+            exit 1
+          fi
+          CHANGELOG=$(gh release view alpha --json body --jq .body)
+
+          echo "APK_FILENAME=$APK_FILENAME" >> "$GITHUB_OUTPUT"
+          echo "APP_VERSION_NAME=$APP_VERSION_NAME" >> "$GITHUB_OUTPUT"
+          echo "APP_VERSION_CODE=$APP_VERSION_CODE" >> "$GITHUB_OUTPUT"
           {
             echo "CHANGELOG<<BSEOF"
-            cat $GITHUB_WORKSPACE/outputs/changelog
+            echo "$CHANGELOG"
             echo "BSEOF"
           } >> "$GITHUB_OUTPUT"
+        env:
+          GH_TOKEN: ${{ github.token }}
 
       - name: Get Upload Params
         id: upload-params
@@ -40,7 +52,6 @@ jobs:
         id: upload-apk
         run: |
           cd $GITHUB_WORKSPACE/outputs/apk/release
-          mv app-arm64-v8a-release.apk $APK_FILENAME
           RESPONSE=$(curl -X POST "https://v0.api.upyun.com/fzuhelper-filedown" \
             -F "file=@$APK_FILENAME" \
             -F "policy=$UPYUN_POLICY" \
@@ -50,7 +61,7 @@ jobs:
 
           echo "DOWNLOAD_URL=$DOWNLOAD_URL" >> "$GITHUB_OUTPUT"
         env:
-          APK_FILENAME: FzuHelper_${{ steps.version-info.outputs.APP_VERSION_NAME }}(${{ steps.version-info.outputs.APP_VERSION_CODE }}).apk
+          APK_FILENAME: ${{ steps.version-info.outputs.APK_FILENAME }}
           UPYUN_POLICY: ${{ steps.upload-params.outputs.UPYUN_POLICY }}
           UPYUN_AUTH: ${{ steps.upload-params.outputs.UPYUN_AUTH }}
 
diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml
@@ -6,24 +6,26 @@ on:
 jobs:
   build_ipa:
     runs-on: macos-latest
+    timeout-minutes: 60
     env:
       EXPO_TOKEN: ${{ secrets.EXPO_TOKEN }}
 
     steps:
-      - uses: actions/checkout@v4
+      - name: Checkout Source Code
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
 
       - name: Restore Cache
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         with:
           path: |
             ${{ github.workspace }}/node_modules
           key: ${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
           restore-keys: |
             ${{ runner.os }}-
 
-      - name: Setup Node
+      - name: Setup Node.js
         uses: actions/setup-node@v6
         with:
           node-version: 22
@@ -33,14 +35,12 @@ jobs:
         run: yarn install --frozen-lockfile --prefer-offline
 
       - name: Download EAS CLI
-        uses: robinraju/release-downloader@v1
-        with:
-          repository: linrongda/eas-cli
-          latest: true
-          tag: local-submit-v1
-          fileName: eas-cli.tar.gz
-          out-file-path: eas-cli
-          extract: true
+        run: |
+          mkdir -p eas-cli
+          gh release download --repo linrongda/eas-cli --pattern eas-cli.tar.gz --dir eas-cli
+          tar -xzf eas-cli/eas-cli.tar.gz -C eas-cli
+        env:
+          GH_TOKEN: ${{ github.token }}
 
       - name: Compute and Inject buildNumber
         run: |
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -8,31 +8,34 @@ on:
       - '[0-9]+.[0-9]+.[0-9]+'
   workflow_dispatch:
 
-jobs:
-  build:
-    uses: ./.github/workflows/build.yml
-    secrets: inherit
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
+jobs:
   ios:
     if: github.ref == 'refs/heads/master'
     uses: ./.github/workflows/ios.yml
     secrets: inherit
 
+  android:
+    if: github.ref == 'refs/heads/master'
+    uses: ./.github/workflows/android.yml
+    secrets: inherit
+
   alpha:
     if: github.ref == 'refs/heads/master'
-    needs: build
+    needs: android
     uses: ./.github/workflows/alpha.yml
     secrets: inherit
 
   beta:
     if: github.event_name == 'workflow_dispatch'
-    needs: build
     uses: ./.github/workflows/beta.yml
     secrets: inherit
 
   release:
     if: startsWith(github.ref, 'refs/tags/')
-    needs: build
     uses: ./.github/workflows/release.yml
     secrets: inherit
 
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -10,64 +10,45 @@ jobs:
       contents: write
 
     steps:
-      - name: Checkout source code
-        uses: actions/checkout@v4
+      - name: Checkout Source Code
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
 
-      - uses: actions/download-artifact@v4
-        with:
-          name: outputs
-          path: ${{ github.workspace }}/outputs/
-
-      - name: Extract APK
-        id: apk-info
+      - name: Download APK
+        id: apk
         shell: bash
         run: |
-          APP_VERSION_CODE=$(cat $GITHUB_WORKSPACE/outputs/version-code)
-          APP_VERSION_NAME=$(cat $GITHUB_WORKSPACE/outputs/version-name)
-          APK_FILENAME="FzuHelper_${APP_VERSION_NAME}(${APP_VERSION_CODE}).apk"
-          echo "apk_filename=$APK_FILENAME" >> "$GITHUB_OUTPUT"
-          mv $GITHUB_WORKSPACE/outputs/apk/release/app-arm64-v8a-release.apk $APK_FILENAME
-
-      - name: Get version info
-        id: version-info
-        run: |
-          CURRENT_VERSION=${GITHUB_REF_NAME}
-          echo "current_version=$CURRENT_VERSION" >> $GITHUB_OUTPUT
+          mkdir -p "$GITHUB_WORKSPACE/outputs/apk/release"
+          gh release download alpha --pattern "FzuHelper_*.apk" --dir "$GITHUB_WORKSPACE/outputs/apk/release"
 
-          git fetch --tags --force
-          ALL_TAGS=$(git tag -l "*.*.*" --sort=-v:refname | grep -E '^[0-9]+\.[0-9]+\.[0-9]+$')
+          APK_PATH=$(ls "$GITHUB_WORKSPACE"/outputs/apk/release/FzuHelper_*.apk | head -n 1)
+          if [[ -z "$APK_PATH" ]]; then
+              echo "Error: APK file not found in the release assets."
+              exit 1
+          fi
 
-          PREV_TAG=$(echo "$ALL_TAGS" | grep -B1 "$GITHUB_REF_NAME" | head -n1)
+          echo "APK_PATH=$APK_PATH" >> "$GITHUB_OUTPUT"
+        env:
+          GH_TOKEN: ${{ github.token }}
 
-          [ -z "$PREV_TAG" ] && PREV_TAG=$(git rev-list --max-parents=0 HEAD)
-
-          echo "prev_tag=$PREV_TAG" >> $GITHUB_OUTPUT
-
-      - name: Generate changelog
-        id: changelog
+      - name: Generate Release Info
+        id: info
         run: |
-          CHANGELOG=$(git log --pretty=format:"- [%%h] %%s (by %%an)" \
-            --date=short \
-            --no-merges \
-            ${{ steps.version-info.outputs.prev_tag }}..HEAD | sed 's/%/%%/g')
-
-          COMPARE_URL="https://github.com/${{ github.repository }}/compare/${{ steps.version-info.outputs.prev_tag }}...${{ github.ref_name }}"
+          CURRENT_VERSION=${GITHUB_REF_NAME}
+          echo "CURRENT_VERSION=$CURRENT_VERSION" >> $GITHUB_OUTPUT
 
-          echo "changelog<<EOF" >> $GITHUB_OUTPUT
-          echo "## [${{ steps.version-info.outputs.current_version }}]($COMPARE_URL)" >> $GITHUB_OUTPUT
+          echo "DATE_TIME<<EOF" >> $GITHUB_OUTPUT
           echo "### $(date +'%Y-%m-%d')" >> $GITHUB_OUTPUT
-          echo "$CHANGELOG" >> $GITHUB_OUTPUT
           echo "EOF" >> $GITHUB_OUTPUT
 
       - name: Create GitHub Release
         uses: softprops/action-gh-release@v2
         with:
           tag_name: ${{ github.ref_name }}
-          name: ${{ steps.version-info.outputs.current_version }}
+          name: ${{ steps.info.outputs.CURRENT_VERSION }}
           generate_release_notes: true # 自动生成发布说明
-          body: ${{ steps.changelog.outputs.changelog }}
+          body: ${{ steps.info.outputs.DATE_TIME }}
           make_latest: true
           files: |
-            ${{ steps.apk-info.outputs.apk_filename }}
+            ${{ steps.apk.outputs.APK_PATH }}
diff --git a/.github/workflows/version.yml b/.github/workflows/version.yml
@@ -11,20 +11,21 @@ jobs:
       pull-requests: write
 
     steps:
-      - uses: actions/checkout@v4
+      - name: Checkout Source Code
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
 
-      - name: Extract current tag
+      - name: Extract Current Tag
         id: tag
         run: |
           CURRENT_TAG=${GITHUB_REF_NAME}
-          echo "current=$CURRENT_TAG" >> $GITHUB_OUTPUT
+          echo "CURRENT_TAG=$CURRENT_TAG" >> $GITHUB_OUTPUT
 
-      - name: Calculate next version
+      - name: Calculate Next Version
         id: version
         run: |
-          IFS='.' read -r major minor patch <<< "${{ steps.tag.outputs.current }}"
+          IFS='.' read -r major minor patch <<< "${{ steps.tag.outputs.CURRENT_TAG }}"
 
           if [ "$patch" -lt 9 ]; then
             patch=$((patch+1))
@@ -39,19 +40,19 @@ jobs:
           fi
 
           NEXT_VERSION="$major.$minor.$patch"
-          echo "next=$NEXT_VERSION" >> $GITHUB_OUTPUT
+          echo "NEXT_VERSION=$NEXT_VERSION" >> $GITHUB_OUTPUT
 
-      - name: Bump version
+      - name: Bump Version
         run: |
-          jq '.version = "${{ steps.version.outputs.next }}"' package.json > package.tmp && mv package.tmp package.json
+          jq '.version = "${{ steps.version.outputs.NEXT_VERSION }}"' package.json > package.tmp && mv package.tmp package.json
 
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v7
+        uses: peter-evans/create-pull-request@v8
         with:
           token: ${{ github.token }}
-          title: 'chore: bump version to ${{ steps.version.outputs.next }}'
-          body: 'Auto bump version to ${{ steps.version.outputs.next }} (detected tag ${{ steps.tag.outputs.current }})'
+          title: 'chore: bump version to ${{ steps.version.outputs.NEXT_VERSION }}'
+          body: 'Auto bump version to ${{ steps.version.outputs.NEXT_VERSION }} (detected tag ${{ steps.tag.outputs.CURRENT_TAG }})'
           base: master
-          branch: bump-version-${{ steps.version.outputs.next }}
-          commit-message: 'chore: bump version to ${{ steps.version.outputs.next }}'
+          branch: bump-version-${{ steps.version.outputs.NEXT_VERSION }}
+          commit-message: 'chore: bump version to ${{ steps.version.outputs.NEXT_VERSION }}'
           sign-commits: true
