-
Notifications
You must be signed in to change notification settings - Fork 26.6k
fix(beta): PR resolvers/smoke check should typecheck all pacakges #23913
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||||
|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -61,7 +61,7 @@ async function typecheck() { | |||||||||
| console.log(" Running typecheck...") | ||||||||||
|
|
||||||||||
| try { | ||||||||||
| await $`bun typecheck`.cwd("packages/opencode") | ||||||||||
| await $`bun typecheck` | ||||||||||
| return true | ||||||||||
| } catch (err) { | ||||||||||
| console.log(`Typecheck failed: ${err}`) | ||||||||||
|
|
@@ -113,7 +113,7 @@ async function fix(pr: PR, files: string[], prs: PR[], applied: number[], idx: n | |||||||||
| "If bun.lock is conflicted, do not hand-merge it. Delete bun.lock and run bun install after the code conflicts are resolved.", | ||||||||||
| "If a PR already deleted a file/directory, do not re-add it, instead apply changes in the new semantic location.", | ||||||||||
| "If a PR already changed an import, keep that change.", | ||||||||||
| "After resolving the conflicts, run `bun typecheck` in `packages/opencode`.", | ||||||||||
| "After resolving the conflicts, run \`bun typecheck\` at the repo root.", | ||||||||||
| "If typecheck fails, you may also update any files reported by typecheck.", | ||||||||||
| "Keep any non-conflict edits narrowly scoped to restoring a valid merged state for the current PR batch.", | ||||||||||
| "Fix any merge-caused typecheck errors before finishing.", | ||||||||||
|
|
@@ -149,8 +149,8 @@ async function smoke(prs: PR[], applied: number[]) { | |||||||||
| const prompt = [ | ||||||||||
| "The beta merge batch is complete.", | ||||||||||
| `Merged PRs on HEAD:\n${done}`, | ||||||||||
| "Run `bun typecheck` in `packages/opencode`.", | ||||||||||
| "Run `./script/build.ts --single` in `packages/opencode`.", | ||||||||||
| "Run \`bun typecheck\` at the repo root.", | ||||||||||
| "Run \`./script/build.ts --single\` in \`packages/opencode\`.", | ||||||||||
|
||||||||||
| "Run \`bun typecheck\` at the repo root.", | |
| "Run \`./script/build.ts --single\` in \`packages/opencode\`.", | |
| "Run `bun typecheck` at the repo root.", | |
| "Run `./script/build.ts --single` in `packages/opencode`.", |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
These backslashes will be included literally in the prompt string (e.g., it will print "`bun typecheck`") since backticks don’t need escaping inside double-quoted TS strings. Remove the backslashes so the prompt renders as intended.