Add monthly upstream Zed sync workflow - #9
Open
crichalchemist wants to merge 3 commits into
Open
Conversation
Adds .github/workflows/sync_upstream.yml, a monthly (1st, 06:17 UTC) and manually-dispatchable job that merges zed-industries/zed@main into a stable sync/upstream branch and opens or updates a single PR against main. It never pushes to main and never auto-merges. Deterministic conflicts are auto-resolved (community/duplicate-bot workflows we deleted stay deleted; Cargo.lock is taken from upstream); real conflicts are committed with markers and the PR is labeled needs-conflict-resolution. An optional SYNC_PAT secret lets the sync PR trigger CI; without it the job still runs via GITHUB_TOKEN. Tracked in CER-1600. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
gh pr create/list/edit default the base repo to the fork's parent (zed-industries/zed), so the sync PR lookup and creation would target the wrong repo in Actions. Set GH_REPO to github.repository to pin all gh commands to this fork. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Repoints the monthly sync to merge the newest stable zed-industries/zed release tag (newest v* tag excluding pre/rc/nightly) instead of upstream/main, for a more stable and reproducible base. Also corrects the SYNC_PAT note: the fork's test workflows (run_tests.yml etc.) are gated to the zed-industries org and are skipped on this fork, so a sync PR gets no CI today regardless of token. SYNC_PAT becomes useful once fork CI is enabled (tracked separately). Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
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
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.
Adds
.github/workflows/sync_upstream.yml— a monthly (1st of month, 06:17 UTC) and manually-dispatchable job that mergeszed-industries/zed@maininto a stablesync/upstreambranch and opens/updates a single PR againstmain. It never pushes tomainand never auto-merges.Because the fork carries divergent commits (new crates
dream_inspector/reverie_agent, Cerebral themes), the sync must be a merge → PR —gh repo syncand off-the-shelf fork-sync actions don't apply.Deterministic conflicts are auto-resolved (community/duplicate-bot workflows we deleted stay deleted;
Cargo.locktaken from upstream). Real conflicts are committed with markers and the PR is labeledneeds-conflict-resolution.Optional
SYNC_PATsecret lets the sync PR trigger CI; without it the job still runs viaGITHUB_TOKEN(but the PR won't firerun_tests.yml).Tracked in CER-1600.
Release Notes: