CI: Clean up issues still in the scripts

Author: castastrophe

.github/workflows/automerge.yml

@@ -3,6 +3,9 @@
 name: Auto-merge pull request if requirements met
 
 on:
+  pull_request_review:
+    types:
+      - submitted
   workflow_run:
     workflows: ["Build & test"]
     types:
@@ -14,8 +17,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Attempt merge
-        if: github.event.workflow_run.conclusion == 'success'
-        uses: "pascalgn/[email protected]"
+        uses: pascalgn/[email protected]
         env:
           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
           MERGE_LABELS: "!work in progress!,!on hold,!blocked,!needs: code updates,!needs: additional info,!needs: AT updates,!needs: changelog,!ready: branch testing,!ready: browser testing"
@@ -24,4 +26,4 @@ jobs:
           MERGE_COMMIT_MESSAGE: "pull-request-title"
           MERGE_RETRIES: 3
           MERGE_RETRY_SLEEP: 10000
-          UPDATE_METHOD: rebase
+          UPDATE_METHOD: merge

.github/workflows/label.yml

@@ -6,7 +6,10 @@ name: Auto-label PRs
 
 on:
   pull_request:
-    types: [opened, convert_to_draft, ready_for_review]
+    types:
+      - opened
+      - convert_to_draft
+      - ready_for_review
   pull_request_review:
     types: [submitted]
 

.github/workflows/tests.yml

@@ -4,11 +4,13 @@
 name: Build & test
 
 on:
-  # Manual run, no inputs necessary
-  workflow_dispatch: []
   # Build when a PR
   pull_request:
-    types: [opened, synchronize, labeled, ready_for_review]
+    types:
+      - opened
+      - synchronize
+      - labeled
+      - ready_for_review
     # Will only run if files other than these are edited
     paths-ignore:
       - ".github/ISSUE_TEMPLATE/**"
@@ -22,13 +24,16 @@ on:
   # Build when PRs are merged into master/main
   push:
     branches: [master, main]
+  # Manual run, no inputs necessary
+  workflow_dispatch:
 
 env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
   # For webdriver script
   BROWSERSTACK_USER: ${{ secrets.BROWSERSTACK_USER }}
   BROWSERSTACK_KEY: ${{ secrets.BROWSERSTACK_KEY }}
+
   # https://github.blog/changelog/2020-10-01-github-actions-deprecating-set-env-and-add-path-commands/
   ACTIONS_ALLOW_UNSECURE_COMMANDS: "true"
 
@@ -156,7 +161,8 @@ jobs:
     if: |
       contains(github.event.pull_request.labels.*.name, 'ready to merge') ||
       contains(github.event.pull_request.labels.*.name, 'run e2e') ||
-      contains(github.event.pull_request.user.login, 'dependabot')
+      contains(github.event.pull_request.user.login, 'dependabot') ||
+      contains(github.event.pull_request.user.login, 'dependabot-preview')
     runs-on: ubuntu-latest
     strategy:
       matrix: