Skip to content

👷 ci(schemastore): branch from upstream master #3828

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gaborbernat merged 2 commits into from
Feb 25, 2026
+6 −2
Merged

👷 ci(schemastore): branch from upstream master #3828

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7971dc6
👷 ci(schemastore): branch from upstream master
gaborbernat Feb 25, 2026
cb5a45f
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Feb 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions .github/workflows/update-schemastore.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
2 changes: 2 additions & 0 deletions docs/changelog/3828.bugfix.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Fix SchemaStore update workflow creating PRs with merge conflicts by branching from upstream master - by
:user:`gaborbernat`.