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:
7
.github/workflows/fork-sync-skills.yml
vendored
7
.github/workflows/fork-sync-skills.yml
vendored
@@ -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
|
||||
;;
|
||||
|
||||
2
.github/workflows/merge-forward-skills.yml
vendored
2
.github/workflows/merge-forward-skills.yml
vendored
@@ -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) {
|
||||
|
||||
Reference in New Issue
Block a user