hanzoai/dev
2
0
Fork 0
mirror of https://github.com/hanzoai/dev.git synced 2026-10-25 03:32:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

ci(upstream-merge): pass merge-policy.json to agent; describe using policy globs instead of hardcoded lists

Browse Source
This commit is contained in:
James Peter
2025-09-07 11:34:01 +10:00
parent a11921f31f
commit ef4e5559fa
2 changed files with 30 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/merge-policy.json
+23
View File
@@ -0,0 +1,23 @@
{
"prefer_ours_globs": [
"codex-rs/tui/**",
"codex-cli/**",
".github/workflows/**",
"AGENTS.md",
"README.md",
"CHANGELOG.md"
],
"prefer_theirs_globs": [
"codex-rs/core/**",
"codex-rs/common/**",
"codex-rs/protocol/**",
"codex-rs/exec/**",
"codex-rs/file-search/**"
],
"purge_globs": [
".github/codex-cli-*.png",
".github/codex-cli-*.jpg",
".github/codex-cli-*.jpeg",
".github/codex-cli-*.webp"
]
}
.github/workflows/upstream-merge.yml
+7 -2
View File
@@ -174,6 +174,9 @@ jobs:
{ {
printf 'Context\n- UPSTREAM_REPO=%s\n- UPSTREAM_BRANCH=%s\n- MERGE_BRANCH=%s\n- DEFAULT_BRANCH=%s\n\n' \ printf 'Context\n- UPSTREAM_REPO=%s\n- UPSTREAM_BRANCH=%s\n- MERGE_BRANCH=%s\n- DEFAULT_BRANCH=%s\n\n' \
"$UPSTREAM_REPO" "$UPSTREAM_BRANCH" "$MERGE_BRANCH" "$DEFAULT_BRANCH"; "$UPSTREAM_REPO" "$UPSTREAM_BRANCH" "$MERGE_BRANCH" "$DEFAULT_BRANCH";
echo '<policy>';
cat .github/merge-policy.json 2>/dev/null || echo '{ }';
echo '</policy>';
cat << 'EOP' cat << 'EOP'
<task> <task>
You are the maintainer bot. Perform an upstream merge using our repo policies and a selective reconciliation strategy. You are the maintainer bot. Perform an upstream merge using our repo policies and a selective reconciliation strategy.
@@ -182,8 +185,10 @@ jobs:
2) Ensure remote `upstream` points to the UPSTREAM_REPO in Context. Fetch origin and upstream. 2) Ensure remote `upstream` points to the UPSTREAM_REPO in Context. Fetch origin and upstream.
3) Re-create branch MERGE_BRANCH from origin/DEFAULT_BRANCH. 3) Re-create branch MERGE_BRANCH from origin/DEFAULT_BRANCH.
4) Merge upstream/UPSTREAM_BRANCH using `--no-commit`. 4) Merge upstream/UPSTREAM_BRANCH using `--no-commit`.
- For files matching OURS_GLOBS: keep ours; if upstream added new files under these globs, remove them. - Use the <policy> JSON for prefer_ours_globs / prefer_theirs_globs / purge_globs.
- For files matching THEIRS_GLOBS: prefer theirs. - For files matching prefer_ours_globs: keep ours; if upstream added new files under these globs that we don’t have, prefer deletion.
- For files matching prefer_theirs_globs: prefer theirs.
- For any path listed in purge_globs: ensure it remains deleted if upstream reintroduced it.
- For everything else, default to ours unless the change is a clear, trivial improvement (typos/docs) that doesn’t conflict with our direction. - For everything else, default to ours unless the change is a clear, trivial improvement (typos/docs) that doesn’t conflict with our direction.
5) Stage and commit with a conventional message and short build status. 5) Stage and commit with a conventional message and short build status.
6) Run ./build-fast.sh (warnings treated as failures). Apply minimal safe fixes only. 6) Run ./build-fast.sh (warnings treated as failures). Apply minimal safe fixes only.