From 70accfce47b02977775c29e0b3b423c0b89db881 Mon Sep 17 00:00:00 2001
From: Ivor Thibodo <ithibodo@articulate.com>
Date: Wed, 17 Jun 2026 15:34:00 -0500
Subject: [PATCH] ci(auto-merge): add workflow to auto-merge dependency PRs

---
 .github/CODEOWNERS                |  3 +++
 .github/dependabot.yml            |  6 ++++++
 .github/workflows/auto-merge.yaml | 22 ++++++++++++++++++++++
 .github/workflows/build.yaml      | 29 +++++++++++++++++++----------
 .github/workflows/lint.yaml       | 14 ++++++++++++--
 5 files changed, 62 insertions(+), 12 deletions(-)
 create mode 100644 .github/workflows/auto-merge.yaml

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index d881085..73fd1c9 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1 +1,4 @@
 * @articulate/devex
+
+# Allow Botzo to approve dependency bumps (and related updates)
+/.github/workflows/ @articulate/devex @botzo
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 3a626c3..855770d 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -4,3 +4,9 @@ updates:
     directory: /
     schedule:
       interval: monthly
+    commit-message:
+      prefix: ci
+    groups:
+      actions:
+        patterns:
+          - "*"
diff --git a/.github/workflows/auto-merge.yaml b/.github/workflows/auto-merge.yaml
new file mode 100644
index 0000000..0cc6e12
--- /dev/null
+++ b/.github/workflows/auto-merge.yaml
@@ -0,0 +1,22 @@
+name: Auto-merge Dependencies
+
+on:
+  pull_request:
+
+jobs:
+  auto-merge:
+    runs-on: ubuntu-slim
+    if: >
+      github.event.pull_request.user.login == 'dependabot[bot]' ||
+      github.event.pull_request.user.login == 'articulate-automation[bot]'
+    steps:
+      - name: Approve PR
+        env:
+          GH_TOKEN: ${{ secrets.BOTZO_GH_TOKEN }}
+          PR: ${{ github.event.pull_request.number }}
+        run: gh pr review --approve "$PR" -R "$GITHUB_REPOSITORY"
+      - name: Enable auto-merge
+        env:
+          GH_TOKEN: ${{ secrets.BOTZO_GH_TOKEN }}
+          PR: ${{ github.event.pull_request.number }}
+        run: gh pr merge --auto --squash "$PR" -R "$GITHUB_REPOSITORY"
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index b8a1932..c04ae9d 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -2,22 +2,23 @@ name: Build
 
 on:
   pull_request:
+  merge_group:
   push:
     branches:
       - main
   schedule:
-    - cron: '0 0 * * 1-6'
-    - cron: '0 0 * * 0' # runs with no-cache
+    - cron: "0 0 * * 1-6"
+    - cron: "0 0 * * 0" # runs with no-cache
   workflow_dispatch:
     inputs:
       no-cache:
-        description: 'Skip Docker cache'
+        description: "Skip Docker cache"
         type: boolean
         default: false
 
 jobs:
   setup:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-slim
     steps:
       - uses: actions/checkout@v6
       - name: Find Dockerfiles
@@ -53,17 +54,25 @@ jobs:
       - uses: docker/build-push-action@v7
         with:
           context: ${{ steps.meta.outputs.context }}
-          pull: ${{ github.event_name != 'pull_request' }}
-          push: ${{ github.event_name != 'pull_request' }}
+          pull: ${{ github.event_name != 'pull_request' && github.event_name != 'merge_group' }}
+          push: ${{ github.event_name != 'pull_request' && github.event_name != 'merge_group' }}
           tags: ${{ steps.meta.outputs.tags }}
           platforms: ${{ steps.meta.outputs.platforms }}
           cache-from: type=registry,ref=${{ steps.meta.outputs.cache }}
           cache-to: type=inline
           no-cache: ${{ github.event.schedule == '0 0 * * 0' || (github.event_name == 'workflow_dispatch' && inputs.no-cache) }}
+  build-complete:
+    if: always()
+    runs-on: ubuntu-slim
+    needs: [build]
+    steps:
+      - name: Verify build succeeded
+        run: |
+          [ "${{ needs.build.result }}" = "success" ] || exit 1
   dockerhub:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-slim
     needs: build
-    if: github.event_name != 'pull_request'
+    if: github.event_name != 'pull_request' && github.event_name != 'merge_group'
     steps:
       - uses: actions/checkout@v6
       - uses: peter-evans/dockerhub-description@1b9a80c056b620d92cedb9d9b5a223409c68ddfa # pin@v4
@@ -73,8 +82,8 @@ jobs:
           password: ${{ secrets.DOCKERHUB_TOKEN }}
           short-description: ${{ github.event.repository.description }}
   notify:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-slim
     needs: build
-    if: github.event_name != 'pull_request'
+    if: github.event_name != 'pull_request' && github.event_name != 'merge_group'
     steps:
       - run: curl ${{ secrets.DMS_URL }}
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
index fa9e948..45abc12 100644
--- a/.github/workflows/lint.yaml
+++ b/.github/workflows/lint.yaml
@@ -1,10 +1,12 @@
 name: Lint
 
-on: pull_request
+on:
+  pull_request:
+  merge_group:
 
 jobs:
   setup:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-slim
     steps:
       - uses: actions/checkout@v6
       - name: Find Dockerfiles
@@ -25,3 +27,11 @@ jobs:
         with:
           dockerfile: ${{ matrix.dockerfile }}
           ignore: DL3008,DL3016,DL3033
+  lint-complete:
+    if: always()
+    runs-on: ubuntu-slim
+    needs: [lint]
+    steps:
+      - name: Verify lint succeeded
+        run: |
+          [ "${{ needs.lint.result }}" = "success" ] || exit 1