Merge pull request #850 from keymanapp/chore/merge-master-to-staging-…

…a17s24

chore: Merge master to staging for Sprint A17S24

.github/workflows/auto-approve-keyman-server-pr.yml

@@ -0,0 +1,20 @@
+#
+# Automatically approves pull requests opened by keyman-server
+# The initial use of this action is to upload product help documentation
+# with resources/build/help-keyman-com.sh.
+# That script creates a PR and then this workflow will be
+# triggered to approve the PR, and then auto-merge-keyman-server-pr.yml
+# will merge it
+#
+name: Auto Approve PRs from keyman-server
+
+on: pull_request_target
+
+jobs:
+  auto-approve:
+    runs-on: ubuntu-latest
+    permissions:
+      pull-requests: write
+    steps:
+    - uses: hmarr/auto-approve-action@44888193675f29a83e04faf4002fa8c0b537b1e4 # v3.2.1
+      if: github.actor == 'keyman-server'

.github/workflows/auto-merge-keyman-server-pr.yml

@@ -3,27 +3,38 @@
 # The initial use of this action is to upload product help documentation
 # with resources/build/help-keyman-com.sh.
 # That script creates a PR and then this workflow will be
-# triggered to approve the PR (from github-actions account), and
-# then automerge it.
+# triggered to merge the PR once approved by the
+# auto-approve-keyman-server-pr.yml script.
 #
 name: Auto Merge PRs from keyman-server
 on:
   pull_request:
-    types: [opened]
-
+    types:
+      - labeled
+      - unlabeled
+      - synchronize
+      - opened
+      - edited
+      - ready_for_review
+      - reopened
+      - unlocked
+  pull_request_review:
+    types:
+      - submitted
+  status:
+  check_suite:
+    types:
+      - completed
 jobs:
-  build:
+  automerge:
     runs-on: ubuntu-latest
     steps:
-    - name: auto approve PR from keyman-server
-      uses: hmarr/[email protected]
-      if: github.actor == 'keyman-server'
-      with:
-        github-token: "${{ secrets.GITHUB_TOKEN }}"
     - name: auto merge PR from keyman-server
-      uses: "pascalgn/automerge-action@01fb84a9d077930bf9d16d1f7fa3fe2ffe45aabe"
+      uses: "pascalgn/automerge-action@22948e0bc22f0aa673800da838595a3e7347e584" # v0.15.6
       if: github.actor == 'keyman-server'
       env:
         GITHUB_TOKEN: "${{ secrets.AUTOINC_GITHUB_TOKEN }}"
         MERGE_LABELS: "auto"
         MERGE_FORKS: false
+        MERGE_RETRY: 6
+        MERGE_RETRY_SLEEP: 30000