Merge pull request #3719 from SillyTavern/fix-workflows-v2-v1.1

Fixing GitHub Workflows - again (maybe this time it works)

.github/issues-auto-labels.yml

@@ -14,7 +14,7 @@
     - '(🐧 Linux)'
 
 🦊 Firefox:
-    - '(firefox|mozilla)'
+    - '\b(firefox|mozilla)\b'
 
 📱 Mobile:
-    - '(iphone|ios|android|📱 Termux)'
+    - '\b(iphone|ios|android|📱 Termux)\b'

.github/pr-auto-labels-by-branch.yml

@@ -34,6 +34,9 @@
 🦊 Firefox:
 - head-branch: ['\bfirefox\b']
 
+🧑‍🤝‍🧑 Group Chat:
+- head-branch: ['\bgroups?\b']
+
 🖼️ Image Gen:
 - head-branch: ['\bimage-gen\b']
 
@@ -58,6 +61,9 @@
 📜 Prompt:
 - head-branch: ['\bprompt\b']
 
+🧠 Reasoning:
+- head-branch: ['\breasoning\b', '\breason\b', '\bthinking\b']
+
 🚚 Refactor:
 - head-branch: ['\brefactor(s|ed)?\b']
 

.github/workflows/issues-auto-manager.yml

@@ -32,7 +32,7 @@ jobs:
         with:
           configuration-path: .github/issues-auto-labels.yml
           enable-versioned-regex: 0
-          repo-token: ${{ secrets.BOT_GITHUB_TOKEN || secrets.GITHUB_TOKEN }}
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
 
   label-on-labels:
     name: 🏷️ Label Issues by Labels
@@ -46,7 +46,7 @@ jobs:
         uses: actions-cool/issues-helper@v3.6.0
         with:
           actions: 'add-labels'
-          token: ${{ secrets.BOT_GITHUB_TOKEN || secrets.GITHUB_TOKEN }}
+          token: ${{ secrets.GITHUB_TOKEN }}
           labels: '👍 Approved'
 
       - name: ❌ Remove progress labels when issue is marked done or stale
@@ -56,7 +56,7 @@ jobs:
         uses: actions-cool/issues-helper@v3.6.0
         with:
           actions: 'remove-labels'
-          token: ${{ secrets.BOT_GITHUB_TOKEN || secrets.GITHUB_TOKEN }}
+          token: ${{ secrets.GITHUB_TOKEN }}
           labels: '🧑‍💻 In Progress,🤔 Unsure,🤔 Under Consideration'
 
       - name: ❌ Remove temporary labels when confirmed labels are added
@@ -66,7 +66,7 @@ jobs:
         uses: actions-cool/issues-helper@v3.6.0
         with:
           actions: 'remove-labels'
-          token: ${{ secrets.BOT_GITHUB_TOKEN || secrets.GITHUB_TOKEN }}
+          token: ${{ secrets.GITHUB_TOKEN }}
           labels: '🤔 Unsure,🤔 Under Consideration'
 
       - name: ❌ Remove no bug labels when "🪲 Confirmed" is added
@@ -76,7 +76,7 @@ jobs:
         uses: actions-cool/issues-helper@v3.6.0
         with:
           actions: 'remove-labels'
-          token: ${{ secrets.BOT_GITHUB_TOKEN || secrets.GITHUB_TOKEN }}
+          token: ${{ secrets.GITHUB_TOKEN }}
           labels: '✖️ Not Reproducible,✖️ Not A Bug'
 
   remove-stale-label:
@@ -92,7 +92,7 @@ jobs:
         uses: actions-cool/issues-helper@v3.6.0
         with:
           actions: 'remove-labels'
-          token: ${{ secrets.BOT_GITHUB_TOKEN || secrets.GITHUB_TOKEN }}
+          token: ${{ secrets.GITHUB_TOKEN }}
           issue-number: ${{ github.event.issue.number }}
           labels: '⚰️ Stale,🕸️ Inactive,🚏 Awaiting User Response,🛑 No Response'
 
@@ -113,4 +113,4 @@ jobs:
         uses: peaceiris/actions-label-commenter@v1.10.0
         with:
           config_file: .github/issues-auto-comments.yml
-          github_token: ${{ secrets.BOT_GITHUB_TOKEN || secrets.GITHUB_TOKEN }}
+          github_token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/issues-updates-on-merge.yml

@@ -31,7 +31,7 @@ jobs:
       - name: Label Linked Issues
         id: label_linked_issues
         env:
-          GH_TOKEN: ${{ secrets.BOT_GITHUB_TOKEN || secrets.GITHUB_TOKEN }}
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
             for ISSUE in $(echo $issues | jq -r '.[]'); do
             if [ "${{ github.ref }}" == "refs/heads/staging" ]; then

.github/workflows/job-close-stale.yml

@@ -22,7 +22,7 @@ jobs:
         # https://github.com/marketplace/actions/close-stale-issues
         uses: actions/stale@v9.1.0
         with:
-          repo-token: ${{ secrets.BOT_GITHUB_TOKEN || secrets.GITHUB_TOKEN }}
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
           days-before-stale: 183
           days-before-close: 7
           operations-per-run: 30
@@ -56,7 +56,7 @@ jobs:
         # https://github.com/marketplace/actions/close-stale-issues
         uses: actions/stale@v9.1.0
         with:
-          repo-token: ${{ secrets.BOT_GITHUB_TOKEN || secrets.GITHUB_TOKEN }}
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
           days-before-stale: 7
           days-before-close: 7
           operations-per-run: 30
@@ -83,7 +83,7 @@ jobs:
         # https://github.com/marketplace/actions/close-stale-issues
         uses: actions/stale@v9.1.0
         with:
-          repo-token: ${{ secrets.BOT_GITHUB_TOKEN || secrets.GITHUB_TOKEN }}
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
           days-before-stale: 7
           days-before-close: 7
           operations-per-run: 30

.github/workflows/on-close-handler.yml

@@ -23,6 +23,6 @@ jobs:
         uses: actions-cool/issues-helper@v3.6.0
         with:
           actions: remove-labels
-          token: ${{ secrets.BOT_GITHUB_TOKEN || secrets.GITHUB_TOKEN }}
+          token: ${{ secrets.GITHUB_TOKEN }}
           issue-number: ${{ github.event.issue.number || github.event.pull_request.number }}
           labels: '🚏 Awaiting User Response,🧑‍💻 In Progress,📌 Keep Open,🚫 Merge Conflicts,🔬 Needs Testing,🔨 Needs Work,⚰️ Stale,⛔ Waiting For External/Upstream'

.github/workflows/on-open-handler.yml

@@ -24,6 +24,6 @@ jobs:
         uses: actions-cool/issues-helper@v3.6.0
         with:
           actions: 'add-labels'
-          token: ${{ secrets.BOT_GITHUB_TOKEN || secrets.GITHUB_TOKEN }}
+          token: ${{ secrets.GITHUB_TOKEN }}
           issue-number: ${{ github.event.issue.number || github.event.pull_request.number }}
           labels: '👷 Maintainer'

.github/workflows/pr-auto-manager.yml

@@ -14,14 +14,22 @@ jobs:
   label-by-size:
     name: 🏷️ Label PR by Size
     runs-on: ubuntu-latest
+    # Only needs to run when code is changed
+    if: github.event.action == 'opened' || github.event.action == 'synchronize'
+
+    # Override permissions, the labeler needs issues write access
+    permissions:
+      contents: read
+      issues: write
+      pull-requests: write
 
     steps:
       - name: Label PR Size
         # Pull Request Size Labeler
         # https://github.com/marketplace/actions/pull-request-size-labeler
-        uses: codelytv/pr-size-labeler@v1.10.1
+        uses: codelytv/pr-size-labeler@v1.10.2
         with:
-          GITHUB_TOKEN: ${{ secrets.BOT_GITHUB_TOKEN || secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           xs_label: '🟩 ⬤○○○○'
           xs_max_size: '20'
           s_label: '🟩 ⬤⬤○○○'
@@ -32,7 +40,6 @@ jobs:
           l_max_size: '1000'
           xl_label: '🟥 ⬤⬤⬤⬤⬤'
           fail_if_xl: 'false'
-          github_api_url: 'https://api.github.com'
           files_to_ignore: |
             "package-lock.json"
             "public/lib/*"
@@ -40,8 +47,8 @@ jobs:
   label-by-branches:
     name: 🏷️ Label PR by Branches
     runs-on: ubuntu-latest
-    # Only label once when PR is created or branches are changed, to allow manual label removal
+    # Only label once when PR is created or when base branch is changed, to allow manual label removal
-    if: github.event.action == 'opened' || (github.event.action == 'synchronize' && (github.event.changes.base || github.event.changes.head))
+    if: github.event.action == 'opened' || (github.event.action == 'synchronize' && github.event.changes.base)
 
     steps:
       - name: Checkout Repository
@@ -55,11 +62,13 @@ jobs:
         uses: actions/labeler@v5.0.0
         with:
           configuration-path: .github/pr-auto-labels-by-branch.yml
-          repo-token: ${{ secrets.BOT_GITHUB_TOKEN || secrets.GITHUB_TOKEN }}
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
 
   label-by-files:
     name: 🏷️ Label PR by Files
     runs-on: ubuntu-latest
+    # Only needs to run when code is changed
+    if: github.event.action == 'opened' || github.event.action == 'synchronize'
 
     steps:
       - name: Checkout Repository
@@ -73,14 +82,20 @@ jobs:
         uses: actions/labeler@v5.0.0
         with:
           configuration-path: .github/pr-auto-labels-by-files.yml
-          repo-token: ${{ secrets.BOT_GITHUB_TOKEN || secrets.GITHUB_TOKEN }}
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
 
   remove-stale-label:
     name: 🗑️ Remove Stale Label on Comment
     runs-on: ubuntu-latest
-    # Only runs when this is not done by the github actions bot
+    # Only runs on comments not done by the github actions bot
     if: github.event_name == 'pull_request_review_comment' && github.actor != 'github-actions[bot]'
 
+    # Override permissions, issue labeler needs issues write access
+    permissions:
+      contents: read
+      issues: write
+      pull-requests: write
+
     steps:
       - name: Remove Stale Label
         # 🤖 Issues Helper
@@ -88,7 +103,7 @@ jobs:
         uses: actions-cool/issues-helper@v3.6.0
         with:
           actions: 'remove-labels'
-          token: ${{ secrets.BOT_GITHUB_TOKEN || secrets.GITHUB_TOKEN }}
+          token: ${{ secrets.GITHUB_TOKEN }}
           issue-number: ${{ github.event.pull_request.number }}
           labels: '⚰️ Stale'
 
@@ -161,7 +176,7 @@ jobs:
         uses: peaceiris/actions-label-commenter@v1.10.0
         with:
           config_file: .github/pr-auto-comments.yml
-          github_token: ${{ secrets.BOT_GITHUB_TOKEN || secrets.GITHUB_TOKEN }}
+          github_token: ${{ secrets.GITHUB_TOKEN }}
 
   # This runs on merged PRs to staging, reading the PR body and directly linked issues. Check `issues-updates-on-merge.yml`:`update-linked-issues` for commit-based updates.
   update-linked-issues:
@@ -182,7 +197,7 @@ jobs:
           PR_NUMBER=${{ github.event.pull_request.number }}
           REPO=${{ github.repository }}
           API_URL="https://api.github.com/repos/$REPO/pulls/$PR_NUMBER/issues"
-          ISSUES=$(curl -s -H "Authorization: token ${{ secrets.BOT_GITHUB_TOKEN || secrets.GITHUB_TOKEN }}" "$API_URL" | jq -r '.[].number' | jq -R -s -c 'split("\n")[:-1]')
+          ISSUES=$(curl -s -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" "$API_URL" | jq -r '.[].number' | jq -R -s -c 'split("\n")[:-1]')
           echo "linked_issues=$ISSUES" >> $GITHUB_ENV
 
       - name: Merge Issue Lists
@@ -194,7 +209,7 @@ jobs:
       - name: Label Linked Issues
         id: label_linked_issues
         env:
-          GH_TOKEN: ${{ secrets.BOT_GITHUB_TOKEN || secrets.GITHUB_TOKEN }}
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           for ISSUE in $(echo $final_issues | jq -r '.[]'); do
             gh issue edit $ISSUE -R ${{ github.repository }} --add-label "✅ Done (staging)"

.github/workflows/pr-check-merge-conflicts.yaml

@@ -23,6 +23,6 @@ jobs:
         uses: eps1lon/actions-label-merge-conflict@v3.0.3
         with:
           dirtyLabel: '🚫 Merge Conflicts'
-          repoToken: ${{ secrets.BOT_GITHUB_TOKEN || secrets.GITHUB_TOKEN }}
+          repoToken: ${{ secrets.GITHUB_TOKEN }}
           commentOnDirty: >
             ⚠️ This PR has conflicts that need to be resolved before it can be merged.