From 616c1ae10a26672b621a414b90acca049c349686 Mon Sep 17 00:00:00 2001 From: gavrielc Date: Wed, 25 Mar 2026 00:44:15 +0200 Subject: [PATCH] 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) --- .github/workflows/fork-sync-skills.yml | 7 ++++++- .github/workflows/merge-forward-skills.yml | 2 ++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/fork-sync-skills.yml b/.github/workflows/fork-sync-skills.yml index 0d8433e..4191695 100644 --- a/.github/workflows/fork-sync-skills.yml +++ b/.github/workflows/fork-sync-skills.yml @@ -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 ;; diff --git a/.github/workflows/merge-forward-skills.yml b/.github/workflows/merge-forward-skills.yml index b648eb1..82471b0 100644 --- a/.github/workflows/merge-forward-skills.yml +++ b/.github/workflows/merge-forward-skills.yml @@ -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) {