diff options
| author | Dax Raad <[email protected]> | 2026-02-24 23:17:31 -0500 |
|---|---|---|
| committer | Dax Raad <[email protected]> | 2026-02-24 23:17:31 -0500 |
| commit | a487f11a30981f44896ac771f7ade87fba9d6092 (patch) | |
| tree | a02b5992af4474a7f195190a8f206c7e8c21c9dd /.github/workflows/beta.yml | |
| parent | 637059a515a6afd983a8a615f90650d997a821ce (diff) | |
| download | opencode-a487f11a30981f44896ac771f7ade87fba9d6092.tar.gz opencode-a487f11a30981f44896ac771f7ade87fba9d6092.zip | |
ci: auto-resolve merge conflicts in beta sync using opencode
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.
Diffstat (limited to '.github/workflows/beta.yml')
| -rw-r--r-- | .github/workflows/beta.yml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/.github/workflows/beta.yml b/.github/workflows/beta.yml index 20d2bc18d..a7106667b 100644 --- a/.github/workflows/beta.yml +++ b/.github/workflows/beta.yml @@ -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 |