Merge remote-tracking branch 'upstream/dev' into dev

.github/workflows/reportBrokenPlugins.yml

@@ -1,9 +1,18 @@
 name: Test Patches
 on:
     workflow_dispatch:
-    schedule:
-        # Every day at midnight
-        - cron: 0 0 * * *
+        inputs:
+            discord_branch:
+                type: choice
+                description: "Discord Branch to test patches on"
+                options:
+                    - both
+                    - stable
+                    - canary
+                default: both
+    # schedule:
+    #   # Every day at midnight
+    #   - cron: 0 0 * * *
 
 jobs:
     TestPlugins:
@@ -40,28 +49,43 @@ jobs:
             - name: Build Equicord Reporter Version
               run: pnpm buildReporter
 
-            - name: Create Report
+            - name: Run Reporter
               timeout-minutes: 10
               run: |
                   export PATH="$PWD/node_modules/.bin:$PATH"
                   export CHROMIUM_BIN=${{ steps.setup-chrome.outputs.chrome-path }}
 
                   esbuild scripts/generateReport.ts > dist/report.mjs
-                  node dist/report.mjs >> $GITHUB_STEP_SUMMARY
-              env:
-                  DISCORD_TOKEN: ${{ secrets.DTOKEN }}
-                  DISCORD_WEBHOOK: ${{ secrets.WEBHOOK }}
 
-            - name: Create Report (Canary)
-              timeout-minutes: 10
-              if: success() || failure() # even run if previous one failed
-              run: |
-                  export PATH="$PWD/node_modules/.bin:$PATH"
-                  export CHROMIUM_BIN=${{ steps.setup-chrome.outputs.chrome-path }}
-                  export USE_CANARY=true
+                  stable_output_file=$(mktemp)
+                  canary_output_file=$(mktemp)
 
-                  esbuild scripts/generateReport.ts > dist/report.mjs
-                  node dist/report.mjs >> $GITHUB_STEP_SUMMARY
+                  pids=""
+
+                  branch="${{ inputs.discord_branch }}"
+                  if [[ "${{ github.event_name }}" = "schedule" ]]; then
+                    branch="both"
+                  fi
+
+                  if [[ "$branch" = "both" || "$branch" = "stable" ]]; then
+                    node dist/report.mjs > "$stable_output_file" &
+                    pids+=" $!"
+                  fi
+
+                  if [[ "$branch" = "both" || "$branch" = "canary" ]]; then
+                    USE_CANARY=true node dist/report.mjs > "$canary_output_file" &
+                    pids+=" $!"
+                  fi
+
+                  exit_code=0
+                  for pid in $pids; do
+                      if ! wait "$pid"; then
+                        exit_code=1
+                      fi
+                  done
+
+                  cat "$stable_output_file" "$canary_output_file" >> $GITHUB_STEP_SUMMARY
+                  exit $exit_code
               env:
-                  DISCORD_TOKEN: ${{ secrets.DTOKEN }}
-                  DISCORD_WEBHOOK: ${{ secrets.WEBHOOK }}
+                  WEBHOOK_URL: ${{ secrets.WEBHOOK }}
+                  WEBHOOK_SECRET: ${{ secrets.WEBHOOK_SECRET }}