Merge branch 'dev'

Author: LittleCoinCoin

.github/workflows/pkg_release.yml

@@ -5,8 +5,8 @@ on:
     types: [release-package]
 
 jobs:
-  # Auto-merge if validation passed
-  auto-merge-if-validation-passed:
+  # 1. Auto-merge if validation passed
+  check-conflicts-in-merge:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
@@ -57,56 +57,10 @@ jobs:
             });
             
             return { can_merge: true };
-      
-      - name: Notify PR author of success
-        uses: actions/github-script@v7
-        with:
-          github-token: ${{ steps.generate-token.outputs.token }}
-          script: |
-            const message = [
-              "### ✅ No conflicts detected.",
-              "",
-              "This PR will be auto-approved and auto-merged shortly.",
-              "",
-              "### Next Steps",
-              "",
-              "1. The package will be released to the registry under the lowest trust level: unreviewed.",
-              "2. The package will be available for download from the Hatch! package manager.",
-              "3. A review issue will be created in the [repository](https://github.com/${{ github.repository }}/issues) for this package.",
-              "  - Package authors are encouraged to check the review issue and respond to any questions or concerns raised by the reviewers.",
-              "4. Once the review is complete, the package's trust level will be raised to: reviewed.",
-
-            ].join('\n');
 
-            const prNumber = ${{ github.event.client_payload.pr_number }};
-            const [owner, repo] = '${{ github.repository }}'.split('/');
-            
-            await github.rest.issues.createComment({
-              issue_number: prNumber,
-              owner: owner,
-              repo: repo,
-              body: message
-            })
-
-      - name: Auto-approve PR
-        uses: hmarr/auto-approve-action@v4
-        with:
-          github-token: ${{ steps.generate-token.outputs.token }}
-          pull-request-number: ${{ github.event.client_payload.pr_number }}
-      
-      - name: Auto-merge PR
-        uses: pascalgn/automerge-action@v0.16.4
-        env:
-          GITHUB_TOKEN: ${{ steps.generate-token.outputs.token }}
-          MERGE_METHOD: merge
-          MERGE_LABELS: "validation-passed,automerge"
-          MERGE_REMOVE_LABELS: "validation-passed,automerge"
-          MERGE_FORKS: true
-          PULL_REQUEST: ${{ github.event.client_payload.pr_number }}
-
-  # 3. Create Release and Review Issue
+  # 2. Create Release and Review Issue
   create-release-and-review:
-    needs: [auto-merge-if-validation-passed]
+    needs: [check-conflicts-in-merge]
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
@@ -146,16 +100,15 @@ jobs:
           cd downloaded-package
           zip -r ../${{ steps.package-info.outputs.release_name }}.zip .
 
-      # Create GitHub Release
       - name: Create GitHub Release
         id: create-release
         uses: softprops/action-gh-release@v1
         with:
           files: ${{ steps.package-info.outputs.release_name }}.zip
           name: ${{ steps.package-info.outputs.release_name }}
+          tag_name: ${{ steps.package-info.outputs.release_name }}
           token: ${{ steps.generate-token.outputs.token }}
 
-      # Retrieve PR author information
       - name: Retrieve PR author information
         id: author-info
         uses: actions/github-script@v7
@@ -231,3 +184,65 @@ jobs:
             `,
               labels: ['ready-for-review', 'package']
             });
+  
+  # 3. Auto-approve and merge PR if validation, release, and review issue creation were successful
+  approve-and-merge:
+    runs-on: ubuntu-latest
+    needs: [check-conflicts-in-merge, create-release-and-review]
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Generate GitHub App token
+        id: generate-token
+        uses: tibdex/github-app-token@v2
+        with:
+          app_id: ${{ secrets.HATCH_WORKFLOW_APP_ID }}
+          private_key: ${{ secrets.HATCH_WORKFLOW_APP_PRIVATE_KEY }}
+
+      - name: Notify PR author of success
+        uses: actions/github-script@v7
+        with:
+          github-token: ${{ steps.generate-token.outputs.token }}
+          script: |
+            const message = [
+              "### ✅ No conflicts detected.",
+              "",
+              "The package has been successfully validated and [released](https://github.com/${{ github.repository }}/releases",
+              "This PR will be auto-approved and auto-merged shortly.",
+              "",
+              "### Next Steps",
+              "",
+              "1. The package will be released to the registry under the lowest trust level: unreviewed.",
+              "2. The package will be available for download from the Hatch! package manager.",
+              "3. A review issue will be created in the [repository](https://github.com/${{ github.repository }}/issues) for this package.",
+              "  - Package authors are encouraged to check the review issue and respond to any questions or concerns raised by the reviewers.",
+              "4. Once the review is complete, the package's trust level will be raised to: reviewed.",
+
+            ].join('\n');
+
+            const prNumber = ${{ github.event.client_payload.pr_number }};
+            const [owner, repo] = '${{ github.repository }}'.split('/');
+            
+            await github.rest.issues.createComment({
+              issue_number: prNumber,
+              owner: owner,
+              repo: repo,
+              body: message
+            })
+
+      - name: Approve and merge PR
+        uses: hmarr/auto-approve-action@v4
+        with:
+          github-token: ${{ steps.generate-token.outputs.token }}
+          pull-request-number: ${{ github.event.client_payload.pr_number }}
+
+      - name: Auto-merge PR
+        uses: pascalgn/automerge-action@v0.16.4
+        env:
+          GITHUB_TOKEN: ${{ steps.generate-token.outputs.token }}
+          MERGE_METHOD: merge
+          MERGE_LABELS: "validation-passed,automerge"
+          MERGE_REMOVE_LABELS: "validation-passed,automerge"
+          MERGE_FORKS: true
+          PULL_REQUEST: ${{ github.event.client_payload.pr_number }}