nthfuncx/nanoclaw
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
- 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
Download Patch File Download Diff File Expand all files Collapse all files

7
.github/workflows/fork-sync-skills.yml vendored
View File

@@ -67,10 +67,15 @@ jobs:
AUTO_RESOLVABLE=true AUTO_RESOLVABLE=true
for f in $CONFLICTED; do for f in $CONFLICTED; do
case "$f" in 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 checkout --theirs "$f"
git add "$f" git add "$f"
;; ;;
.env.example)
# Keep fork's channel-specific env vars
git checkout --ours "$f"
git add "$f"
;;
*) *)
AUTO_RESOLVABLE=false AUTO_RESOLVABLE=false
;; ;;

2
.github/workflows/merge-forward-skills.yml vendored
View File

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