Merge pull request #7090 from acmesh-official/dev

sync

.github/workflows/issue.yml

@@ -10,10 +10,27 @@ jobs:
       - uses: actions/github-script@v9
         with:
           script: |
-            github.rest.issues.createComment({
-              issue_number: context.issue.number,
+            const issue = context.payload.issue;
+            if (issue.title.startsWith("Report bugs to")) {
+              // Tracking issue for a third-party dns/deploy/notify api:
+              // no upgrade boilerplate; assign it to the opener and label it.
+              await github.rest.issues.addAssignees({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                issue_number: issue.number,
+                assignees: [issue.user.login]
+              });
+              await github.rest.issues.addLabels({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                issue_number: issue.number,
+                labels: ["3rd party api"]
+              });
+              return;
+            }
+            await github.rest.issues.createComment({
+              issue_number: issue.number,
               owner: context.repo.owner,
               repo: context.repo.repo,
               body: "Please upgrade to the latest code and try again first. Maybe it's already fixed.              ```acme.sh --upgrade```              If it's still not working, please provide the log with `--debug 2`, otherwise, nobody can help you."
-              
             })

.github/workflows/wiki-monitor.yml

@@ -9,13 +9,14 @@ jobs:
     if: github.actor != 'neilpang'
     steps:
       - name: Checkout wiki repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
         with:
           repository: ${{ github.repository }}.wiki
           path: wiki
           fetch-depth: 0
 
       - name: Generate wiki change message
+        id: msg
         run: |
             actor="${{ github.actor }}"
             sender_url=$(jq -r '.sender.html_url' "$GITHUB_EVENT_PATH")
@@ -27,6 +28,17 @@ jobs:
             now="$(date '+%Y-%m-%d %H:%M:%S')"
 
             cd wiki
+            # Skip notification when the change was authored by the
+            # maintainer himself (any author email under neilpang.com),
+            # e.g. a direct git push to the wiki repository.
+            author_email=$(git show -s --format=%ae "$page_sha" 2>/dev/null | tr 'A-Z' 'a-z')
+            case "$author_email" in
+              *@neilpang.com)
+                echo "Change authored by maintainer ($author_email); skipping notification."
+                echo "notify=false" >> "$GITHUB_OUTPUT"
+                exit 0
+                ;;
+            esac
             prev_sha=$(git rev-list $page_sha^ -- "$page_name.md" | head -n 1)
             if [ -n "$prev_sha" ]; then
                 git diff $prev_sha $page_sha -- "$page_name.md" > ../wiki.diff || echo "(No diff found)" > ../wiki.diff
@@ -44,13 +56,15 @@ jobs:
             echo "[Click here to Revert](${page_url}/_history)"
             echo ""
             echo "----"
-            echo "###  diff："
+            echo "###  diff:"
             echo '```diff'
             cat wiki.diff
             echo '```'
             } > wiki-change-msg.txt
+            echo "notify=true" >> "$GITHUB_OUTPUT"
 
       - name: Create issue to notify Neilpang
+        if: steps.msg.outputs.notify == 'true'
         uses: peter-evans/create-issue-from-file@v6
         with:
           title: "Wiki edited"