From d87d2d172174532d23649338fb1a7e4e5dc069cc Mon Sep 17 00:00:00 2001 From: The0Mikkel Date: Sun, 16 Nov 2025 17:14:44 +0100 Subject: [PATCH] fix(develop-update): adjust auto-merge condition to include 'not_merge' state --- .github/workflows/develop-update.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/develop-update.yml b/.github/workflows/develop-update.yml index 4e2bdb7..f5de2e5 100644 --- a/.github/workflows/develop-update.yml +++ b/.github/workflows/develop-update.yml @@ -181,7 +181,7 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: "Auto-merge Pull Request" - if: steps.check_merge_source.outputs.latest_from_develop == 'true' && inputs.auto_merge != false + if: (steps.check_merge_source.outputs.latest_from_develop == 'true' || steps.check_merge_source.outputs.latest_from_develop == 'not_merge') && inputs.auto_merge != false run: | gh pr merge "${{ steps.create_pr.outputs.URL }}" -t "chore(ci): Auto update develop to match main [skip ci]" -b "This was done automatically by the CI pipeline" --merge env: