vrr/opencode
2
0
Fork 0
mirror of https://github.com/anomalyco/opencode.git synced 2026-04-28 12:39:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 19

ci: auto-resolve merge conflicts in beta sync using opencode

Browse source 
When merging PRs into the beta branch, the sync script now attempts to automatically resolve merge conflicts using opencode before failing. This reduces manual intervention needed for beta releases when multiple PRs have overlapping changes.
This commit is contained in:
Dax Raad 2026-02-24 23:17:31 -05:00
parent 637059a515
commit a487f11a30
2 changed files with 66 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.github/workflows/beta.yml vendored
View file

@ -27,7 +27,11 @@ jobs:
opencode-app-id: ${{ vars.OPENCODE_APP_ID }}
opencode-app-secret: ${{ secrets.OPENCODE_APP_SECRET }}
- name: Install OpenCode
run: bun i -g opencode-ai
- name: Sync beta branch
env:
GH_TOKEN: ${{ steps.setup-git-committer.outputs.token }}
OPENCODE_API_KEY: ${{ secrets.OPENCODE_API_KEY }}
run: bun script/beta.ts