chore: fix login sync (#10250)

mirror of https://github.com/andwati/zitadel.git synced 2026-10-30 02:52:16 +00:00

# Which Problems Are Solved

When changes are pulled or pushed from or to a login repository, they
can't be merged to zitadel, because the commit histories differ.

# How the Problems Are Solved

Changed the commands to allow diverging commit histories.
Pulling takes a lot of commits into the zitadel repo branch like this.
This is fine, as we anyway squash-merge PRs to a single commit.
So we don't care about a branches commit history.

# Additional Changes

Added an exception to the close-pr.yml workflow so sync PRs are not
auto-closed.

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: Florian Forster <[email protected]>
Co-authored-by: Max Peintner <[email protected]>
Co-authored-by: Max Peintner <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Copilot <[email protected]>

This commit is contained in:

Elio Bischof

2025-07-15 09:23:34 +00:00

committed by

GitHub

co-authored by

Florian Forster

Max Peintner

dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Copilot

parent 14a5946db8

commit 91487a0b23

2 changed files with 12 additions and 5 deletions

									
										login/.github/workflows/close_pr.yml
									
Vendored

		+1
		-1
	
												View File
												
				@@ -8,7 +8,7 @@ on:

				jobs:

				  auto-close:

				    runs-on: ubuntu-latest

				    if: github.repository_id == '622995060'

				    if: github.repository_id == '622995060' && github.ref_name != 'mirror-zitadel-repo'

				    steps:

				      - name: Comment and close PR

				        uses: actions/github-script@v7