ci(sync-upstream): auto-resolve pr.yml by keeping fork version - #12
Merged
Merged
Conversation
The fork has intentionally simplified .github/workflows/pr.yml (no NX Cloud, no nx-set-shas, no preview job, uses test:ci instead of test:pr), so any upstream change to that file conflicts with our customizations. The v0.21.1 sync failed for this reason. Add a rule to keep the fork's version on conflict, alongside the existing rules for release.yml, changelogs, and example package.json files.
|
Hi! I'm the It looks like you correctly set up a CI job that uses the autofix.ci GitHub Action, but the autofix.ci GitHub App has not been installed for this repository. This means that autofix.ci unfortunately does not have the permissions to fix this pull request. If you are the repository owner, please install the app and then restart the CI workflow! 😃 |
autofix.ci
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
The v0.21.1 upstream sync run failed with:
The fork has intentionally simplified
.github/workflows/pr.yml:NX_CLOUD_ACCESS_TOKENenv (fork has no NX Cloud access)nx-set-shasstep /fetch-depth: 0(fork usestest:ci, nottest:pr)previewjob (fork doesn't runpkg-pr-newpreviews)Because both sides touched this file in the v0.21.1 sync, git produced a content conflict and the auto-resolver had no rule for it. The same conflict will recur on every future upstream change to
pr.yml.This PR adds an auto-resolution rule that keeps the fork's version (
git checkout --ours) — analogous to the existing rule for.github/workflows/release.yml, which is also fork-divergent.If upstream introduces a
pr.ymlimprovement the fork wants (e.g. action SHA pinning), the maintainer can cherry-pick it manually.Test plan
upstream/mainintoorigin/main.github/workflows/pr.ymlcleanly (git checkout --ours+git add) and thatrelease.ymlstill resolvesgit diff --name-only --diff-filter=Ureturns empty after applying both rulespr.ymlon the merge branch matches the fork's simplified versionhttps://claude.ai/code/session_01QaapKgU28S1T5TH2ffsay2
Generated by Claude Code