ci: fixing broken automerge (#1223)

* Attempt to fix the broken automerge flow

* Remove PR info

* Trying to fix the automerge functionality

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

Author: castastrophe

.github/workflows/automerge.yml

@@ -5,40 +5,23 @@ name: Auto-merge pull request if requirements met
 on:
   workflow_run:
     workflows: ["Build & test"]
-    types: [completed]
+    types:
+      - completed
 
 jobs:
   try_to_merge:
     name: Try to merge the PR if allowed
     runs-on: ubuntu-latest
     steps:
-      - name: Wait for tests to succeed
-        uses: fountainhead/[email protected]
-        id: wait-for-tests
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          checkName: "Build & test"
-          ref: ${{ github.event.pull_request.head.sha || github.sha }}
-      - name: PR ${{ github.event.number }}
-        if: |
-          (
-            steps.wait-for-tests.outputs.conclusion == 'success' ||
-            (
-              github.event_name == 'workflow_run' &&
-              github.event.workflow_run.conclusion == 'success'
-            )
-          ) &&
-          !contains(github.event.pull_request.labels.*.name, 'work in progress') &&
-          !contains(github.event.pull_request.labels.*.name, 'on hold') &&
-          github.event.pull_request.draft == false
-        uses: "pascalgn/automerge-action@4536e8847eb62fe2f0ee52c8fa92d17aa97f932f"
+      - name: Attempt merge
+        if: github.event.workflow_run.conclusion == 'success
+        uses: "pascalgn/[email protected]"
         env:
           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
-          MERGE_LABELS: "ready to merge,!work in progress!,!on hold,!blocked,!needs: code updates,!needs: additional info,!needs: AT updates,!needs: changelog,!ready: branch testing,!ready: browser testing"
-          MERGE_REMOVE_LABELS: Ready to merge
+          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"
+          MERGE_REMOVE_LABELS: "ready to merge"
           MERGE_METHOD: squash
           MERGE_COMMIT_MESSAGE: "pull-request-title"
           MERGE_RETRIES: 3
           MERGE_RETRY_SLEEP: 10000
-          UPDATE_LABELS: "ready to merge,!work in progress!,!blocked"
           UPDATE_METHOD: rebase

.github/workflows/tests.yml

@@ -18,6 +18,7 @@ on:
       - "generators/**"
       - "**/*.md"
       - "**/*.text"
+      - "*.md"
   # Build when PRs are merged into master/main
   push:
     branches: [master, main]
@@ -33,6 +34,7 @@ env:
 
   # Turn this on to debug an action
   # GITHUB_CONTEXT: ${{ toJson(github) }}
+
 jobs:
   build:
     name: Compile project
@@ -44,6 +46,10 @@ jobs:
         node: [10]
     # Confirm that the PR is not in draft
     if: |
+      (
+        github.event_name == 'labeled' &&
+        (github.event.label.name == 'run e2e' || github.event.label.name == 'ready to merge')
+      ) ||
       (
         github.event_name == 'pull_request' &&
         github.event.pull_request.draft == false