From 1fcd4f699561c5bc5feb4746b6367fc8d1e7c0c2 Mon Sep 17 00:00:00 2001
From: Greg Logan <gregorydlogan@gmail.com>
Date: Fri, 24 Apr 2026 22:05:15 -0600
Subject: [PATCH] Automate merging the PR generated when this submodule updates

---
 .github/workflows/deploy-main-branches.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/deploy-main-branches.yml b/.github/workflows/deploy-main-branches.yml
index 0375dc461..13da3871c 100644
--- a/.github/workflows/deploy-main-branches.yml
+++ b/.github/workflows/deploy-main-branches.yml
@@ -154,6 +154,7 @@ jobs:
             gh pr edit $CURRENT_PR \
               --body "Updating Opencast ${{ needs.detect-repo-owner.outputs.branch }} Editor module to [${{ github.sha }}](https://github.com/${{ github.repository_owner }}/editor/commit/${{ github.sha }})" \
               -R ${{ github.repository_owner }}/opencast
+            gh pr merge --auto --merge
           else
             gh pr create \
               --title "Update ${{ needs.detect-repo-owner.outputs.branch }} Editor" \
@@ -164,4 +165,8 @@ jobs:
               #FIXME: fine grained PATs can't apply labels
               #FIXME: classic PATs don't have the permissions because the PR isn't in an opencastproject (the user) repo
               #--label editor --label maintenance \
+            # Set the PR to auto merge
+            # We sleep here since sometimes the merge call right after might be too fast for Github
+            sleep 30
+            gh pr merge --auto --merge
           fi