fix: expand auto-resolve patterns and add missing forks to dispatch

- Auto-resolve .env.example (keep fork's channel-specific vars) and
  .github/workflows/* (always take upstream) during fork sync
- Add docker-sandbox and docker-sandbox-windows to dispatch list

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
gavrielc
2026-03-25 00:44:15 +02:00
parent 4d853c5d38
commit 616c1ae10a
2 changed files with 8 additions and 1 deletions

View File

@@ -67,10 +67,15 @@ jobs:
AUTO_RESOLVABLE=true
for f in $CONFLICTED; do
case "$f" in
package-lock.json|package.json|repo-tokens/badge.svg)
package-lock.json|package.json|repo-tokens/badge.svg|.github/workflows/*)
git checkout --theirs "$f"
git add "$f"
;;
.env.example)
# Keep fork's channel-specific env vars
git checkout --ours "$f"
git add "$f"
;;
*)
AUTO_RESOLVABLE=false
;;

View File

@@ -160,6 +160,8 @@ jobs:
'nanoclaw-slack',
'nanoclaw-gmail',
'nanoclaw-docker-sandboxes',
'nanoclaw-docker-sandbox',
'nanoclaw-docker-sandbox-windows',
];
const sha = context.sha.substring(0, 7);
for (const repo of forks) {