Skip to content

Commit 0e2d2e5

Browse files
authored
Merge branch 'main' into main
2 parents 311aed3 + a50b93f commit 0e2d2e5

18 files changed

+84
-36
lines changed

.changeset/forty-windows-shop.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.changeset/lemon-fireants-repair.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.changeset/lovely-toys-obey.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

apps/webapp/app/v3/services/completeAttempt.server.ts

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -696,5 +696,17 @@ function isOOMError(error: TaskRunError) {
696696
return true;
697697
}
698698

699+
// For the purposes of retrying on a larger machine, we're going to treat this is an OOM error.
700+
// This is what they look like if we're executing using k8s. They then get corrected later, but it's too late.
701+
// {"code": "TASK_PROCESS_EXITED_WITH_NON_ZERO_CODE", "type": "INTERNAL_ERROR", "message": "Process exited with code -1 after signal SIGKILL."}
702+
if (
703+
error.code === "TASK_PROCESS_EXITED_WITH_NON_ZERO_CODE" &&
704+
error.message &&
705+
error.message.includes("SIGKILL") &&
706+
error.message.includes("-1")
707+
) {
708+
return true;
709+
}
710+
699711
return false;
700712
}

docs/machines.mdx

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,16 @@ export const config: TriggerConfig = {
2626
};
2727
```
2828

29+
## Overriding the machine when triggering
30+
31+
You can also override the task machine when you [trigger](/triggering) it:
32+
33+
```ts
34+
await tasks.trigger<typeof heavyTask>("heavy-task", { message: "hello world" }, { machine: "large-2x" });
35+
```
36+
37+
This is useful when you know that a certain payload will require more memory than the default machine. For example, you know it's a larger file or a customer that has a lot of data.
38+
2939
## Out Of Memory errors
3040

3141
Sometimes you might see one of your runs fail with an "Out Of Memory" error.

packages/build/CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
# @trigger.dev/build
22

3+
## 3.3.14
4+
5+
### Patch Changes
6+
7+
- Missing construction option in `AudioWaveformExtension` ([#1684](https://github.com/triggerdotdev/trigger.dev/pull/1684))
8+
- Updated dependencies:
9+
- `@trigger.dev/core@3.3.14`
10+
311
## 3.3.13
412

513
### Patch Changes

packages/build/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@trigger.dev/build",
3-
"version": "3.3.13",
3+
"version": "3.3.14",
44
"description": "trigger.dev build extensions",
55
"license": "MIT",
66
"publishConfig": {
@@ -69,8 +69,8 @@
6969
"check-exports": "attw --pack ."
7070
},
7171
"dependencies": {
72-
"@trigger.dev/core": "workspace:3.3.13",
73-
"@trigger.dev/sdk": "workspace:3.3.13",
72+
"@trigger.dev/core": "workspace:3.3.14",
73+
"@trigger.dev/sdk": "workspace:3.3.14",
7474
"pkg-types": "^1.1.3",
7575
"tinyexec": "^0.3.2",
7676
"tinyglobby": "^0.2.2",

packages/cli-v3/CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
# trigger.dev
22

3+
## 3.3.14
4+
5+
### Patch Changes
6+
7+
- Auto-fix /trigger or /src/trigger config.dirs to relative paths to prevent misconfiguration from preventing dev CLI from working ([#1665](https://github.com/triggerdotdev/trigger.dev/pull/1665))
8+
- Updated dependencies:
9+
- `@trigger.dev/build@3.3.14`
10+
- `@trigger.dev/core@3.3.14`
11+
312
## 3.3.13
413

514
### Patch Changes

packages/cli-v3/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "trigger.dev",
3-
"version": "3.3.13",
3+
"version": "3.3.14",
44
"description": "A Command-Line Interface for Trigger.dev (v3) projects",
55
"type": "module",
66
"license": "MIT",
@@ -87,8 +87,8 @@
8787
"@opentelemetry/sdk-trace-base": "1.25.1",
8888
"@opentelemetry/sdk-trace-node": "1.25.1",
8989
"@opentelemetry/semantic-conventions": "1.25.1",
90-
"@trigger.dev/build": "workspace:3.3.13",
91-
"@trigger.dev/core": "workspace:3.3.13",
90+
"@trigger.dev/build": "workspace:3.3.14",
91+
"@trigger.dev/core": "workspace:3.3.14",
9292
"c12": "^1.11.1",
9393
"chalk": "^5.2.0",
9494
"chokidar": "^3.6.0",

packages/core/CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# internal-platform
22

3+
## 3.3.14
4+
35
## 3.3.13
46

57
### Patch Changes

packages/core/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@trigger.dev/core",
3-
"version": "3.3.13",
3+
"version": "3.3.14",
44
"description": "Core code used across the Trigger.dev SDK and platform",
55
"license": "MIT",
66
"publishConfig": {

packages/react-hooks/CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
# @trigger.dev/react-hooks
22

3+
## 3.3.14
4+
5+
### Patch Changes
6+
7+
- Updated dependencies:
8+
- `@trigger.dev/core@3.3.14`
9+
310
## 3.3.13
411

512
### Patch Changes

packages/react-hooks/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@trigger.dev/react-hooks",
3-
"version": "3.3.13",
3+
"version": "3.3.14",
44
"description": "trigger.dev react hooks",
55
"license": "MIT",
66
"publishConfig": {
@@ -37,7 +37,7 @@
3737
"check-exports": "attw --pack ."
3838
},
3939
"dependencies": {
40-
"@trigger.dev/core": "workspace:^3.3.13",
40+
"@trigger.dev/core": "workspace:^3.3.14",
4141
"swr": "^2.2.5"
4242
},
4343
"devDependencies": {

packages/rsc/CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
# @trigger.dev/rsc
22

3+
## 3.3.14
4+
5+
### Patch Changes
6+
7+
- Updated dependencies:
8+
- `@trigger.dev/core@3.3.14`
9+
310
## 3.3.13
411

512
### Patch Changes

packages/rsc/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@trigger.dev/rsc",
3-
"version": "3.3.13",
3+
"version": "3.3.14",
44
"description": "trigger.dev rsc",
55
"license": "MIT",
66
"publishConfig": {
@@ -37,14 +37,14 @@
3737
"check-exports": "attw --pack ."
3838
},
3939
"dependencies": {
40-
"@trigger.dev/core": "workspace:^3.3.13",
40+
"@trigger.dev/core": "workspace:^3.3.14",
4141
"mlly": "^1.7.1",
4242
"react": "19.0.0-rc.1",
4343
"react-dom": "19.0.0-rc.1"
4444
},
4545
"devDependencies": {
4646
"@arethetypeswrong/cli": "^0.15.4",
47-
"@trigger.dev/build": "workspace:^3.3.13",
47+
"@trigger.dev/build": "workspace:^3.3.14",
4848
"@types/node": "^20.14.14",
4949
"@types/react": "*",
5050
"@types/react-dom": "*",

packages/trigger-sdk/CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
# @trigger.dev/sdk
22

3+
## 3.3.14
4+
5+
### Patch Changes
6+
7+
- Added the ability to retry runs that fail with an Out Of Memory (OOM) error on a larger machine. ([#1691](https://github.com/triggerdotdev/trigger.dev/pull/1691))
8+
- Updated dependencies:
9+
- `@trigger.dev/core@3.3.14`
10+
311
## 3.3.13
412

513
### Patch Changes

packages/trigger-sdk/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@trigger.dev/sdk",
3-
"version": "3.3.13",
3+
"version": "3.3.14",
44
"description": "trigger.dev Node.JS SDK",
55
"license": "MIT",
66
"publishConfig": {
@@ -48,7 +48,7 @@
4848
"@opentelemetry/api": "1.9.0",
4949
"@opentelemetry/api-logs": "0.52.1",
5050
"@opentelemetry/semantic-conventions": "1.25.1",
51-
"@trigger.dev/core": "workspace:3.3.13",
51+
"@trigger.dev/core": "workspace:3.3.14",
5252
"chalk": "^5.2.0",
5353
"cronstrue": "^2.21.0",
5454
"debug": "^4.3.4",

pnpm-lock.yaml

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

0 commit comments

Comments
 (0)