From 38d1fdd077a6805fa28203c74bdabd58f693bd49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 9 May 2025 12:58:23 +0200
Subject: [PATCH] add auto-merge github action

also use app token for update-flake-lock so that auto-merge actions can be triggered
---
 .github/workflows/auto-merge.yaml       | 14 ++++++++++++++
 .github/workflows/update-flake-lock.yml |  8 +++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 .github/workflows/auto-merge.yaml

diff --git a/.github/workflows/auto-merge.yaml b/.github/workflows/auto-merge.yaml
new file mode 100644
index 0000000..f0d5b7c
--- /dev/null
+++ b/.github/workflows/auto-merge.yaml
@@ -0,0 +1,14 @@
+name: Auto Merge Dependency Updates
+on:
+  - pull_request_target
+jobs:
+  auto-merge-dependency-updates:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      pull-requests: write
+    concurrency:
+      group: "auto-merge:${{ github.head_ref }}"
+      cancel-in-progress: true
+    steps:
+      - uses: Mic92/auto-merge@main
diff --git a/.github/workflows/update-flake-lock.yml b/.github/workflows/update-flake-lock.yml
index 5517c93..4d790fb 100644
--- a/.github/workflows/update-flake-lock.yml
+++ b/.github/workflows/update-flake-lock.yml
@@ -16,13 +16,19 @@ jobs:
         uses: cachix/install-nix-action@v31
         with:
           github_access_token: ${{ secrets.GITHUB_TOKEN }}
+      - uses: actions/create-github-app-token@v1
+        id: app-token
+        with:
+          app-id: ${{ vars.CI_APP_ID }}
+          private-key: ${{ secrets.CI_APP_PRIVATE_KEY }}
       - name: Update flake.lock
         uses: DeterminateSystems/update-flake-lock@v24
         with:
+          token: ${{ steps.app-token.outputs.token }}
           pr-body: |
             Automated changes by the update-flake-lock
             ```
             {{ env.GIT_COMMIT_MESSAGE }}
             ```
           pr-labels: | # Labels to be set on the PR
-            merge-queue
+            auto-merge