Commit Graph

35 Commits

Author SHA1 Message Date
Luke Parker 81c4d85eb7 fix: unblock beta conflict recovery (#19068) 2026-03-25 06:14:38 +00:00
Luke Parker 8a987ee885 fix: beta resolver typecheck + build smoke check (#19060) 2026-03-25 05:45:30 +00:00
Luke Parker 110c3bd372 fix: provide merge context to beta conflict resolver (#19055) 2026-03-25 04:45:37 +00:00
Dax Raad a3acc03f22 ci: exclude draft PRs from beta labeling process to prevent unfinished work from being included in releases 2026-03-10 14:08:55 -04:00
Dax Raad 9b2d662f8a ci: switch beta script to gpt-5.3-codex for improved code generation quality 2026-02-24 23:26:03 -05:00
Dax Raad 93a88697ac ci: specify opencode/kimi-k2.5 model in beta script to ensure consistent PR processing 2026-02-24 23:22:56 -05:00
Dax Raad 81ca7c0479 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.
2026-02-24 23:17:31 -05:00
Caleb Norton 83cc44f616 ci: allow commits on top of beta PRs (#11924) 2026-02-18 00:20:05 -06:00
Dax Raad c79bf18fdf ci: sort beta PRs by number for consistent display order 2026-02-09 18:00:44 -05:00
Dax Raad a31cd00201 ci: skip force push when beta branch is unchanged 2026-02-01 20:35:02 -05:00
Dax Raad 34083134a3 ci: centralize team list in @opencode-ai/script package and use beta label filter 2026-02-01 20:17:15 -05:00
Dax Raad eb698d478d ci: add --label beta filter to only process PRs with beta label 2026-02-01 19:59:20 -05:00
Dax Raad b2eeffec06 ci: post PR comments when beta merge fails instead of Discord notifications 2026-02-01 19:59:20 -05:00
Dax Raad 2dad509689 ci: rewrite beta script to use proper Bun shell patterns 2026-02-01 19:59:20 -05:00
Dax Raad 2699c67756 ci: remove parseArgs CLI option and use environment variable directly 2026-02-01 19:59:20 -05:00
Dax Raad 4b1e8db459 ci: add --discord-webhook / -d CLI option for custom Discord webhook URL 2026-02-01 19:59:20 -05:00
Dax Raad ed9d872ce7 ci: collect all failed PR merges and notify Discord 2026-02-01 19:59:20 -05:00
Dax Raad 9e576bfa00 ci: prevent rate limit errors when fetching team PRs for beta releases 2026-02-01 19:29:26 -05:00
Dax Raad 63780e8550 ci 2026-01-30 10:39:59 -05:00
Dax Raad cf701afbb8 ci 2026-01-30 10:38:10 -05:00
Dax Raad 51dd136ebb ci 2026-01-30 10:36:01 -05:00
Dax Raad 06250230c6 ci 2026-01-30 10:35:39 -05:00
Dax Raad ea77625490 ci 2026-01-30 10:28:54 -05:00
Dax Raad 0ec75b790a ci 2026-01-30 10:28:12 -05:00
Dax Raad 75ae093eed ci 2026-01-30 10:26:55 -05:00
Dax Raad 4f7db789f5 ci 2026-01-30 10:25:10 -05:00
Dax Raad b923f70e8f ci 2026-01-30 10:23:19 -05:00
Dax Raad 7d6c5f2af9 ci 2026-01-30 10:21:47 -05:00
Dax Raad 1936972772 ci 2026-01-30 10:20:49 -05:00
Dax Raad 41ba279bc0 ci 2026-01-30 10:15:45 -05:00
Dax Raad 413a1aa0cb ci 2026-01-30 10:12:29 -05:00
Dax Raad 6611ddc30b ci 2026-01-30 10:11:05 -05:00
Dax Raad 1aed9868fb fix(beta): use local git rebase instead of gh pr update-branch 2026-01-29 21:25:27 -05:00
Dax Raad e19c82b4b1 ci 2026-01-29 21:23:03 -05:00
Dax 0bda03e271 feat: add beta branch sync workflow for contributor PRs (#11190) 2026-01-29 20:02:36 +00:00