Add auto-merge workflow for agent-sync branch and stop pushing to main

CEO commits memory/runtime updates to agent-sync branch instead of main.
GitHub Actions workflow auto-merges agent-sync into main on push.

Co-Authored-By: Paperclip <noreply@paperclip.ing>
This commit is contained in:
2026-03-18 14:33:27 -04:00
parent ec0eaf5a5b
commit aef34e2461
2 changed files with 25 additions and 2 deletions
@@ -0,0 +1,24 @@
name: Auto-merge agent-sync
on:
push:
branches: [agent-sync]
permissions:
contents: write
jobs:
merge:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0
ref: main
- name: Merge agent-sync into main
run: |
git config user.name "github-actions[bot]"
git config user.email "github-actions[bot]@users.noreply.github.com"
git merge origin/agent-sync --no-edit
git push origin main
+1 -2
View File
@@ -79,8 +79,7 @@ This repo (`/paperclip/privilegedescalation/agents`) is the canonical source of
cd /paperclip/privilegedescalation/agents
git add -A
git diff --cached --quiet || git commit -m "agent: memory and runtime updates $(date -u +%Y-%m-%dT%H:%M:%SZ)"
git pull --rebase origin main
git push origin main
git pull --rebase origin main && git push origin HEAD:refs/heads/agent-sync -f
#### 5b. Detect changes since last sync