Release

.github/workflows/auto-version-release.yml

@@ -33,6 +33,7 @@ jobs:
       main_sha:        ${{ steps.shas.outputs.main_sha }}
       dev_sha:         ${{ steps.shas.outputs.dev_sha }}
       bugfix_sha:      ${{ steps.shas.outputs.bugfix_sha }}
+      release_sha:     ${{ steps.shas.outputs.release_sha }}
 
     steps:
     - name: Checkout with full history
@@ -57,6 +58,10 @@ jobs:
         Write-Output "bugfix_sha=$bugfixSha" >> $env:GITHUB_OUTPUT
         Write-Host "bugfix SHA: $bugfixSha"
 
+        $releaseSha = git rev-parse origin/release
+        Write-Output "release_sha=$releaseSha" >> $env:GITHUB_OUTPUT
+        Write-Host "release SHA: $releaseSha"
+
     - name: Determine source branch and version increment
       id: branch_info
       shell: powershell
@@ -66,9 +71,12 @@ jobs:
         $sourceBranch  = $env:PR_HEAD_REF
         $incrementType = "patch"
 
-        if ($sourceBranch -eq "dev") {
+        if ($sourceBranch -eq "release") {
+            $incrementType = "feature"
+            Write-Host "Source branch: release - incrementing minor version (feature update)"
+        } elseif ($sourceBranch -eq "dev") {
             $incrementType = "minor"
-            Write-Host "Source branch: dev - incrementing minor version"
+            Write-Host "Source branch: dev - incrementing build version (daily update)"
         } elseif ($sourceBranch -eq "bugfix") {
             $incrementType = "patch"
             Write-Host "Source branch: bugfix - incrementing patch version"
@@ -100,11 +108,15 @@ jobs:
         $currentVersion = "$major.$minor.$build.$revision"
 
         $incrementType = "${{ steps.branch_info.outputs.increment_type }}"
-        if ($incrementType -eq "minor") {
-            $build    = $build + 1
-            $revision = 0
+        if ($incrementType -eq "feature") {
+            $minor    = $minor + 1      # 第2位 +1
+            $build    = 0               # 第3位 清零
+            $revision = 0               # 第4位 清零
+        } elseif ($incrementType -eq "minor") {
+            $build    = $build + 1      # 第3位 +1
+            $revision = 0               # 第4位 清零
         } else {
-            $revision = $revision + 1
+            $revision = $revision + 1   # 第4位 +1
         }
 
         $newVersion     = "$major.$minor.$build.$revision"
@@ -331,7 +343,7 @@ jobs:
       run: |
         $sourceBranch = "${{ needs.prepare.outputs.source_branch }}"
 
-        if ($sourceBranch -eq "dev" -or $sourceBranch -eq "bugfix") {
+        if ($sourceBranch -eq "dev" -or $sourceBranch -eq "bugfix" -or $sourceBranch -eq "release") {
             Write-Host "Syncing version back to $sourceBranch..."
             git config --local user.email "action@github.com"
             git config --local user.name "GitHub Action"
@@ -363,7 +375,9 @@ jobs:
     - name: Print summary
       run: |
         INCREMENT="${{ needs.prepare.outputs.increment_type }}"
-        if [ "$INCREMENT" = "minor" ]; then TYPE="Feature Update"; else TYPE="Bugfix Update"; fi
+        if [ "$INCREMENT" = "feature" ]; then TYPE="Major Feature Update"
+        elif [ "$INCREMENT" = "minor" ]; then TYPE="Daily Update"
+        else TYPE="Bugfix Update"; fi
 
         echo ""
         echo -e "\033[0;32m================= Build Complete =================\033[0m"
@@ -411,6 +425,7 @@ jobs:
         $mainSha      = "${{ needs.prepare.outputs.main_sha }}"
         $devSha       = "${{ needs.prepare.outputs.dev_sha }}"
         $bugfixSha    = "${{ needs.prepare.outputs.bugfix_sha }}"
+        $releaseSha   = "${{ needs.prepare.outputs.release_sha }}"
         $sourceBranch = "${{ needs.prepare.outputs.source_branch }}"
 
         # --- 回滚 main ---
@@ -458,6 +473,19 @@ jobs:
             } else {
                 Write-Host "[SKIP] bugfix: no changes detected, rollback not needed"
             }
+        } elseif ($sourceBranch -eq "release" -and $releaseSha) {
+            $ErrorActionPreference = 'Continue'
+            $currentRelease = git rev-parse origin/release 2>&1
+            $ErrorActionPreference = 'Stop'
+            if ($LASTEXITCODE -eq 0 -and $currentRelease -ne $releaseSha) {
+                Write-Host "[ROLLBACK]" -ForegroundColor Cyan -NoNewline; Write-Host " release: $currentRelease -> $releaseSha"
+                git checkout -B release origin/release
+                git reset --hard $releaseSha
+                git push --force origin release
+                Write-Host "[OK]" -ForegroundColor Green -NoNewline; Write-Host " release rolled back"
+            } else {
+                Write-Host "[SKIP] release: no changes detected, rollback not needed"
+            }
         }
 
         Write-Host ""

.github/workflows/branch-protection.yml

@@ -13,8 +13,6 @@ concurrency:
 permissions:
   contents: read
   statuses: write
-  pull-requests: write
-  issues: write
 
 jobs:
   check-source-branch:
@@ -30,106 +28,36 @@ jobs:
         echo "Source branch: $SOURCE_BRANCH"
         echo "Target branch: $BASE_BRANCH"
 
-        if [ "$SOURCE_BRANCH" != "dev" ] && [ "$SOURCE_BRANCH" != "bugfix" ]; then
-          echo -e "\033[0;31m[ERROR]\033[0m Only dev and bugfix branches are allowed to merge into main branch."
+        if [ "$SOURCE_BRANCH" = "release" ] || [ "$SOURCE_BRANCH" = "dev" ] || [ "$SOURCE_BRANCH" = "bugfix" ]; then
+          echo -e "\033[0;32m[OK]\033[0m Source branch validation passed: $SOURCE_BRANCH -> main"
+        else
+          echo -e "\033[0;31m[ERROR]\033[0m Only release, dev and bugfix branches are allowed to merge into main."
           echo "Current source branch: $SOURCE_BRANCH"
           echo ""
-          echo "Please follow the correct workflow:"
-          echo "For features/enhancements:"
-          echo "1. Merge your feature branch into dev first"
-          echo "2. Ensure tests pass on dev branch"
-          echo "3. Then create PR from dev to main"
-          echo ""
-          echo "For urgent bugfixes:"
-          echo "1. Create bugfix branch from main"
-          echo "2. Make necessary fixes"
-          echo "3. Create PR from bugfix to main"
+          echo "Correct workflow:"
+          echo "  release -> main : Major feature update (minor version +1)"
+          echo "  dev     -> main : Daily update (build version +1)"
+          echo "  bugfix  -> main : Urgent bugfix (patch version +1)"
           exit 1
-        else
-          echo -e "\033[0;32m[OK]\033[0m Source branch validation passed: $SOURCE_BRANCH -> main"
         fi
 
-    - name: Add PR comment
-      if: always()
-      uses: actions/github-script@v7
-      with:
-        script: |
-          const sourceBranch = context.payload.pull_request.head.ref;
-
-          let body;
-
-          if (sourceBranch === 'dev' || sourceBranch === 'bugfix') {
-            body = '## [OK] Branch Validation Passed\n\n' +
-              '**Source Branch**: `' + sourceBranch + '` -> **Target Branch**: `main`\n\n' +
-              '**[OK]** This PR follows the correct workflow: `' + sourceBranch + '` -> `main`\n\n' +
-              '**Next Steps:**\n' +
-              '- Ensure all tests pass on the ' + sourceBranch + ' branch\n' +
-              '- Request code review\n' +
-              '- Merge when ready\n\n' +
-              '---\n' +
-              '*This check ensures only dev and bugfix branches can merge into main.*';
-          } else {
-            body = '## [ERROR] Invalid Source Branch\n\n' +
-              '**Source Branch**: `' + sourceBranch + '` -> **Target Branch**: `main`\n\n' +
-              '**[ERROR]** Only `dev` and `bugfix` branches are allowed to merge into `main` branch.\n\n' +
-              '**Correct Workflow:**\n\n' +
-              '**For Features/Enhancements:**\n' +
-              '1. Merge your feature branch into `dev` first\n' +
-              '2. Ensure tests pass on `dev` branch\n' +
-              '3. Create PR from `dev` to `main`\n\n' +
-              '**For Urgent Bugfixes:**\n' +
-              '1. Create `bugfix` branch from `main`\n' +
-              '2. Make necessary fixes\n' +
-              '3. Create PR from `bugfix` to `main`\n\n' +
-              '**Please close this PR and follow the correct workflow.**\n\n' +
-              '---\n' +
-              '*This check ensures code quality and proper release flow.*';
-          }
-
-          const comments = await github.rest.issues.listComments({
-            owner: context.repo.owner,
-            repo: context.repo.repo,
-            issue_number: context.payload.pull_request.number
-          });
-
-          const existingComment = comments.data.find(c =>
-            c.body.includes('Branch Validation') || c.body.includes('Invalid Source Branch')
-          );
-
-          if (existingComment) {
-            await github.rest.issues.updateComment({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              comment_id: existingComment.id,
-              body: body
-            });
-          } else {
-            await github.rest.issues.createComment({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              issue_number: context.payload.pull_request.number,
-              body: body
-            });
-          }
-
     - name: Create status check
       if: always()
       uses: actions/github-script@v7
       with:
         script: |
           const sourceBranch = context.payload.pull_request.head.ref;
-
-          const state = (sourceBranch === 'dev' || sourceBranch === 'bugfix') ? 'success' : 'failure';
-          const description = (sourceBranch === 'dev' || sourceBranch === 'bugfix')
-            ? 'Source branch validation passed [OK]'
-            : 'Only dev and bugfix branches allowed to merge to main [FAILED]';
+          const allowed = ['release', 'dev', 'bugfix'];
+          const isAllowed = allowed.includes(sourceBranch);
 
           await github.rest.repos.createCommitStatus({
             owner: context.repo.owner,
             repo: context.repo.repo,
             sha: context.payload.pull_request.head.sha,
-            state: state,
+            state: isAllowed ? 'success' : 'failure',
             target_url: context.payload.repository.html_url + '/actions/runs/' + context.runId,
-            description: description,
+            description: isAllowed
+              ? `[OK] Source branch validation passed: ${sourceBranch} -> main`
+              : `[FAILED] Only release, dev and bugfix branches allowed to merge to main`,
             context: 'branch-protection/source-validation'
           });

.github/workflows/dev-ci.yml → .github/workflows/pre-publish-branch-ci-check.yml

@@ -1,15 +1,19 @@
-name: Dev Branch CI
+name: Pre-publish Branch CI Check
 
 on:
   push:
     branches:
       - dev
+      - release
+      - bugfix
   pull_request:
     branches:
       - dev
+      - release
+      - bugfix
 
 concurrency:
-  group: dev-ci-${{ github.event.pull_request.number || github.ref }}
+  group: pre-publish-branch-ci-check-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 
 permissions:
@@ -309,6 +313,7 @@ jobs:
       uses: actions/github-script@v7
       with:
         script: |
+          const branch = context.ref.replace('refs/heads/', '') || context.payload.pull_request?.head?.ref || 'unknown';
           const state = process.env.TEST_STATUS || 'failure';
           const description = process.env.TEST_DESCRIPTION || 'Tests failed';
           await github.rest.repos.createCommitStatus({
@@ -317,6 +322,6 @@ jobs:
             sha: context.sha,
             state: state,
             target_url: `${context.payload.repository.html_url}/actions/runs/${context.runId}`,
-            description: description,
-            context: 'ci/dev-tests'
+            description: `[${branch}] ${description}`,
+            context: 'ci-check/pre-publish-tests'
           });