From 8c8c9aa9fdf223115184a59ab000dc2e6ef5df0a Mon Sep 17 00:00:00 2001
From: zumbiepig <121742281+zumbiepig@users.noreply.github.com>
Date: Tue, 3 Sep 2024 13:20:33 -0700
Subject: [PATCH] try this

---
 .github/workflows/compile-clients.yml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/compile-clients.yml b/.github/workflows/compile-clients.yml
index cbbe925..4fc9455 100644
--- a/.github/workflows/compile-clients.yml
+++ b/.github/workflows/compile-clients.yml
@@ -2,7 +2,7 @@ name: Build and compile clients
 
 on:
   schedule:
-    - cron: 0 0 * * *
+    - cron: '0 0 * * *'
   workflow_dispatch:
 
 jobs:
@@ -43,7 +43,13 @@ jobs:
           cp ${{ runner.temp }}/shadow/javascript/classes.js.map ./public/game/web/clients/shadow/classes.js.map
           cp ${{ runner.temp }}/shadow/javascript/Shadow_Client_International.html ./public/game/offline/clients/Shadow_Client.html
       - name: Commit and push changes
+        id: git-auto-commit-action
         uses: stefanzweifel/git-auto-commit-action@v5
         with:
           commit_message: 'github-actions: build and compile clients'
           commit_author: 'github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>'
+      - name: Merge back with 'dev' branch
+        run: |
+          git checkout dev
+          git merge --no-ff ${{ steps.git-auto-commit-action.outputs.commit_hash }}
+          git push origin dev