Skip to content

Commit 0970b10

Browse files
committed
Merge remote-tracking branch 'origin/dev' into dev
2 parents 04074d3 + b16ee08 commit 0970b10

21 files changed

Lines changed: 59 additions & 42 deletions

File tree

.github/workflows/test.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ permissions:
1717
contents: read
1818
checks: write
1919

20+
env:
21+
FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true
22+
2023
jobs:
2124
unit:
2225
name: unit (${{ matrix.settings.name }})
@@ -38,6 +41,11 @@ jobs:
3841
with:
3942
token: ${{ secrets.GITHUB_TOKEN }}
4043

44+
- name: Setup Node
45+
uses: actions/setup-node@v4
46+
with:
47+
node-version: "24"
48+
4149
- name: Setup Bun
4250
uses: ./.github/actions/setup-bun
4351

@@ -102,6 +110,11 @@ jobs:
102110
with:
103111
token: ${{ secrets.GITHUB_TOKEN }}
104112

113+
- name: Setup Node
114+
uses: actions/setup-node@v4
115+
with:
116+
node-version: "24"
117+
105118
- name: Setup Bun
106119
uses: ./.github/actions/setup-bun
107120

bun.lock

Lines changed: 16 additions & 16 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/app/e2e/backend.ts

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,12 @@ async function waitForHealth(url: string, probe = "/global/health") {
4444
throw new Error(`Timed out waiting for backend health at ${url}${probe}${last ? ` (${last})` : ""}`)
4545
}
4646

47+
function done(proc: ReturnType<typeof spawn>) {
48+
return proc.exitCode !== null || proc.signalCode !== null
49+
}
50+
4751
async function waitExit(proc: ReturnType<typeof spawn>, timeout = 10_000) {
48-
if (proc.exitCode !== null) return
52+
if (done(proc)) return
4953
await Promise.race([
5054
new Promise<void>((resolve) => proc.once("exit", () => resolve())),
5155
new Promise<void>((resolve) => setTimeout(resolve, timeout)),
@@ -123,11 +127,11 @@ export async function startBackend(label: string, input?: { llmUrl?: string }):
123127
return {
124128
url,
125129
async stop() {
126-
if (proc.exitCode === null) {
130+
if (!done(proc)) {
127131
proc.kill("SIGTERM")
128132
await waitExit(proc)
129133
}
130-
if (proc.exitCode === null) {
134+
if (!done(proc)) {
131135
proc.kill("SIGKILL")
132136
await waitExit(proc)
133137
}

packages/app/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@opencode-ai/app",
3-
"version": "1.4.2",
3+
"version": "1.4.3",
44
"description": "",
55
"type": "module",
66
"exports": {

packages/console/app/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@opencode-ai/console-app",
3-
"version": "1.4.2",
3+
"version": "1.4.3",
44
"type": "module",
55
"license": "MIT",
66
"scripts": {

packages/console/core/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"$schema": "https://json.schemastore.org/package.json",
33
"name": "@opencode-ai/console-core",
4-
"version": "1.4.2",
4+
"version": "1.4.3",
55
"private": true,
66
"type": "module",
77
"license": "MIT",

packages/console/function/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@opencode-ai/console-function",
3-
"version": "1.4.2",
3+
"version": "1.4.3",
44
"$schema": "https://json.schemastore.org/package.json",
55
"private": true,
66
"type": "module",

packages/console/mail/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@opencode-ai/console-mail",
3-
"version": "1.4.2",
3+
"version": "1.4.3",
44
"dependencies": {
55
"@jsx-email/all": "2.2.3",
66
"@jsx-email/cli": "1.4.3",

packages/desktop-electron/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@opencode-ai/desktop-electron",
33
"private": true,
4-
"version": "1.4.2",
4+
"version": "1.4.3",
55
"type": "module",
66
"license": "MIT",
77
"homepage": "https://opencode.ai",

packages/desktop/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@opencode-ai/desktop",
33
"private": true,
4-
"version": "1.4.2",
4+
"version": "1.4.3",
55
"type": "module",
66
"license": "MIT",
77
"scripts": {

0 commit comments

Comments
 (0)