diff --git a/packages/script/src/index.ts b/packages/script/src/index.ts index 2d991ff0c..496bdede2 100644 --- a/packages/script/src/index.ts +++ b/packages/script/src/index.ts @@ -46,6 +46,20 @@ const VERSION = await (async () => { return `${major}.${minor}.${patch + 1}` })() +const team = [ + "actions-user", + "opencode", + "rekram1-node", + "thdxr", + "kommander", + "jayair", + "fwang", + "adamdotdevin", + "iamdavidhill", + "opencode-agent[bot]", + "R44VC0RP", +] + export const Script = { get channel() { return CHANNEL @@ -59,5 +73,8 @@ export const Script = { get release() { return env.OPENCODE_RELEASE }, + get team() { + return team + }, } console.log(`opencode script`, JSON.stringify(Script, null, 2)) diff --git a/script/beta.ts b/script/beta.ts index 50dc2ad78..53329e4dc 100755 --- a/script/beta.ts +++ b/script/beta.ts @@ -1,7 +1,6 @@ #!/usr/bin/env bun import { $ } from "bun" -import { Script } from "@opencode-ai/script" interface PR { number: number @@ -32,28 +31,12 @@ Please resolve this issue to include this PR in the next beta release.` } async function main() { - console.log("Fetching open PRs with beta label from team members...") + console.log("Fetching open PRs with beta label...") - const allPrs: PR[] = [] - for (const member of Script.team) { - try { - const stdout = - await $`gh pr list --state open --author ${member} --label beta --json number,title,author,labels --limit 100`.text() - const memberPrs: PR[] = JSON.parse(stdout) - allPrs.push(...memberPrs) - } catch { - // Skip member on error - } - } + const stdout = await $`gh pr list --state open --label beta --json number,title,author,labels --limit 100`.text() + const prs: PR[] = JSON.parse(stdout) - const seen = new Set() - const prs = allPrs.filter((pr) => { - if (seen.has(pr.number)) return false - seen.add(pr.number) - return true - }) - - console.log(`Found ${prs.length} open PRs with beta label from team members`) + console.log(`Found ${prs.length} open PRs with beta label`) if (prs.length === 0) { console.log("No team PRs to merge") diff --git a/script/changelog.ts b/script/changelog.ts index 0043cd3d6..5fc30a228 100755 --- a/script/changelog.ts +++ b/script/changelog.ts @@ -3,20 +3,7 @@ import { $ } from "bun" import { createOpencode } from "@opencode-ai/sdk/v2" import { parseArgs } from "util" - -export const team = [ - "actions-user", - "opencode", - "rekram1-node", - "thdxr", - "kommander", - "jayair", - "fwang", - "adamdotdevin", - "iamdavidhill", - "opencode-agent[bot]", - "R44VC0RP", -] +import { Script } from "@opencode-ai/script" type Release = { tag_name: string @@ -191,7 +178,7 @@ export async function generateChangelog(commits: Commit[], opencode: Awaited