From 7971dc6f5a33e34a9bfb5848aff001f1a10721a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bern=C3=A1t=20G=C3=A1bor?= Date: Wed, 25 Feb 2026 14:45:06 +0000 Subject: [PATCH 1/2] =?UTF-8?q?=F0=9F=91=B7=20ci(schemastore):=20branch=20?= =?UTF-8?q?from=20upstream=20master?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The workflow branches from the fork's default branch which can be stale relative to SchemaStore's master, producing PRs with merge conflicts. Fetching and branching from upstream/master ensures a clean base. --- .github/workflows/update-schemastore.yaml | 6 ++++-- docs/changelog/3828.bugfix.rst | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 docs/changelog/3828.bugfix.rst diff --git a/.github/workflows/update-schemastore.yaml b/.github/workflows/update-schemastore.yaml index 844503bad9..22ed4d1fe7 100644 --- a/.github/workflows/update-schemastore.yaml +++ b/.github/workflows/update-schemastore.yaml @@ -16,8 +16,10 @@ jobs: - uses: actions/checkout@v6 - name: Fork and clone SchemaStore run: gh repo fork SchemaStore/schemastore --clone --remote -- /tmp/schemastore - - name: Create or reset branch - run: git switch -C "$BRANCH" + - name: Create or reset branch from upstream + run: | + git fetch upstream master + git switch -C "$BRANCH" upstream/master working-directory: /tmp/schemastore - name: Copy schema with SchemaStore $id run: | diff --git a/docs/changelog/3828.bugfix.rst b/docs/changelog/3828.bugfix.rst new file mode 100644 index 0000000000..42e3799778 --- /dev/null +++ b/docs/changelog/3828.bugfix.rst @@ -0,0 +1 @@ +Fix SchemaStore update workflow creating PRs with merge conflicts by branching from upstream master - by :user:`gaborbernat`. From cb5a45f30b222c94d72ddb7e560f7c831754698e Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Wed, 25 Feb 2026 14:47:06 +0000 Subject: [PATCH 2/2] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- docs/changelog/3828.bugfix.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/changelog/3828.bugfix.rst b/docs/changelog/3828.bugfix.rst index 42e3799778..b1b036b22d 100644 --- a/docs/changelog/3828.bugfix.rst +++ b/docs/changelog/3828.bugfix.rst @@ -1 +1,2 @@ -Fix SchemaStore update workflow creating PRs with merge conflicts by branching from upstream master - by :user:`gaborbernat`. +Fix SchemaStore update workflow creating PRs with merge conflicts by branching from upstream master - by +:user:`gaborbernat`.