This repository was archived by the owner on Aug 17, 2026. It is now read-only.
chore(sync): upstream merge tooling + ci-zge - #16
Merged
Conversation
Add scripts/upstream-sync.sh (status/merge/verify/pr), docs policy, weekly upstream-sync workflow, and ci-zge focused gates so we can merge BlackBelt develop without clobbering deploy/push/OMP surfaces. Default install ref is main; README links the sync runbook.
added 2 commits
July 16, 2026 16:23
Use stable branch sync/upstream-<ref>, force-with-lease each run, upsert the same PR, and close older labeled/sync-head PRs as superseded so a late review only has the latest merge to look at.
Author
|
Updated per request: automation now keeps only one open upstream-sync PR (stable head , force-with-lease, closes superseded sync PRs). |
Author
|
Superseded by latest sync staging on |
Author
|
Reopened. Supersede logic incorrectly closed this tooling PR because it used the \ label; only \ heads are superseded now. |
added 2 commits
July 16, 2026 16:31
Gate 1 invoked vitest with real HOME, which upstream globalSetup rejects. Match root npm test isolation and pass package vitest.config.
joeshull
changed the title
joeshull
changed the title
added 5 commits
July 16, 2026 16:46
Quote PR body heredoc to avoid backtick command substitution; refuse force-with-lease on main/develop/target; recompute SYNC_BRANCH after --ref; simplify workflow conflict-help echoes.
Precedence: --branch > env SYNC_BRANCH > sync/upstream-<ref>.
Capture SYNC_BRANCH_FROM_ENV before applying the default so an explicit SYNC_BRANCH equal to the default name still wins over --ref.
Copy docs/upstream-sync-conflicts-YYYYMMDD.md to /tmp before abort and restore onto the stable sync branch so the draft PR includes inventory.
Prevent SYNC_BRANCH=foo from force-publishing a non-sync head that stale-PR closing would never supersede.
3 tasks
joeshull
enabled auto-merge
July 17, 2026 01:10
joeshull
pushed a commit
that referenced
this pull request
Jul 17, 2026
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 subscribe to this conversation on GitHub.
Already have an account?
Sign in.
1 participant
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
Upstream-sync tooling for ZGEnergy/omp-dashboard (fork of BlackBeltTechnology/pi-agent-dashboard).
Review notes
Test plan