From 473afe449c7d75d2d93b2f9a57f3674be22e0c68 Mon Sep 17 00:00:00 2001 From: zumbiepig <121742281+zumbiepig@users.noreply.github.com> Date: Tue, 3 Sep 2024 13:33:32 -0700 Subject: [PATCH] . --- .github/workflows/compile-clients.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/compile-clients.yml b/.github/workflows/compile-clients.yml index 4fc9455..f12c725 100644 --- a/.github/workflows/compile-clients.yml +++ b/.github/workflows/compile-clients.yml @@ -49,6 +49,7 @@ jobs: 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 + if: steps.git-auto-commit-action.outputs.changes_detected == 'true' run: | git checkout dev git merge --no-ff ${{ steps.git-auto-commit-action.outputs.commit_hash }}