diff --git a/.github/workflows/sync-upstream.yml b/.github/workflows/sync-upstream.yml new file mode 100644 index 000000000000..107c67c16869 --- /dev/null +++ b/.github/workflows/sync-upstream.yml @@ -0,0 +1,58 @@ +# Sync upstream OpenClaw changes to main branch +# This keeps main as a pure mirror of upstream, allowing rebases on secureclaw branch +# +# Required secrets: +# SYNC_TOKEN - Personal Access Token with 'repo' and 'workflow' scopes +# Create at: https://github.com/settings/tokens +# Required scopes: repo, workflow + +name: Sync Upstream + +on: + schedule: + # Run daily at 6 AM UTC + - cron: "0 6 * * *" + workflow_dispatch: + # Allow manual triggering + +jobs: + sync: + runs-on: ubuntu-latest + steps: + - name: Checkout repository + uses: actions/checkout@v4 + with: + fetch-depth: 0 + ref: main + # Use PAT with workflow scope to allow pushing workflow file changes + token: ${{ secrets.SYNC_TOKEN }} + + - name: Configure Git + run: | + git config user.name "github-actions[bot]" + git config user.email "github-actions[bot]@users.noreply.github.com" + + - name: Add upstream remote + run: | + git remote add upstream https://github.com/openclaw/openclaw.git || true + git fetch upstream + + - name: Sync main with upstream + run: | + git checkout main + git reset --hard upstream/main + git push origin main --force + + - name: Create sync summary + run: | + UPSTREAM_SHA=$(git rev-parse upstream/main) + echo "## Upstream Sync Complete" >> $GITHUB_STEP_SUMMARY + echo "" >> $GITHUB_STEP_SUMMARY + echo "Main branch synced to upstream commit: \`${UPSTREAM_SHA}\`" >> $GITHUB_STEP_SUMMARY + echo "" >> $GITHUB_STEP_SUMMARY + echo "To rebase secureclaw branch locally:" >> $GITHUB_STEP_SUMMARY + echo "\`\`\`bash" >> $GITHUB_STEP_SUMMARY + echo "git fetch origin" >> $GITHUB_STEP_SUMMARY + echo "git checkout secureclaw" >> $GITHUB_STEP_SUMMARY + echo "git rebase origin/main" >> $GITHUB_STEP_SUMMARY + echo "\`\`\`" >> $GITHUB_STEP_SUMMARY diff --git a/package.json b/package.json index 9d4ffd09adc7..b6a0cbd1aae9 100644 --- a/package.json +++ b/package.json @@ -11,15 +11,15 @@ "security", "zero-trust" ], - "homepage": "https://github.com/rcholic/secureclaw#readme", + "homepage": "https://github.com/PredicateSystems/secureclaw#readme", "bugs": { - "url": "https://github.com/rcholic/secureclaw/issues" + "url": "https://github.com/PredicateSystems/secureclaw/issues" }, "license": "MIT", "author": "Predicate Systems ", "repository": { "type": "git", - "url": "git+https://github.com/rcholic/secureclaw.git" + "url": "git+https://github.com/PredicateSystems/secureclaw.git" }, "bin": { "openclaw": "openclaw.mjs"