Skip to content

Commit 434078a

Browse files
authored
Merge branch 'main' into feat(webapp)-filters-update
2 parents 611b862 + 3e6458f commit 434078a

72 files changed

Lines changed: 1153 additions & 193 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
"trigger.dev": patch
3+
"@trigger.dev/core": patch
4+
---
5+
6+
Fail attempts on uncaught exceptions instead of hanging to `MAX_DURATION_EXCEEDED`. A Node `EventEmitter` (e.g. `node-redis`) emitting `"error"` with no `.on("error", ...)` listener escalates to `uncaughtException`, which the worker previously reported but did not act on — runs drifted to maxDuration with empty attempts. They now fail fast with the original error and status `FAILED`, and respect the task's normal retry policy. You should still attach `.on("error", ...)` listeners to long-lived clients to handle errors gracefully.

.github/actions/get-image-tag/action.yml

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -23,35 +23,37 @@ runs:
2323
id: get_tag
2424
shell: bash
2525
run: |
26-
if [[ -n "${{ inputs.tag }}" ]]; then
27-
tag="${{ inputs.tag }}"
28-
elif [[ "${{ github.ref_type }}" == "tag" ]]; then
29-
if [[ "${{ github.ref_name }}" == infra-*-* ]]; then
30-
env=$(echo ${{ github.ref_name }} | cut -d- -f2)
31-
sha=$(echo ${{ github.sha }} | head -c7)
26+
if [[ -n "${INPUTS_TAG}" ]]; then
27+
tag="${INPUTS_TAG}"
28+
elif [[ "${GITHUB_REF_TYPE}" == "tag" ]]; then
29+
if [[ "${GITHUB_REF_NAME}" == infra-*-* ]]; then
30+
env=$(echo ${GITHUB_REF_NAME} | cut -d- -f2)
31+
sha=$(echo "${GITHUB_SHA}" | head -c7)
3232
ts=$(date +%s)
3333
tag=${env}-${sha}-${ts}
34-
elif [[ "${{ github.ref_name }}" == re2-*-* ]]; then
35-
env=$(echo ${{ github.ref_name }} | cut -d- -f2)
36-
sha=$(echo ${{ github.sha }} | head -c7)
34+
elif [[ "${GITHUB_REF_NAME}" == re2-*-* ]]; then
35+
env=$(echo ${GITHUB_REF_NAME} | cut -d- -f2)
36+
sha=$(echo "${GITHUB_SHA}" | head -c7)
3737
ts=$(date +%s)
3838
tag=${env}-${sha}-${ts}
39-
elif [[ "${{ github.ref_name }}" == v.docker.* ]]; then
39+
elif [[ "${GITHUB_REF_NAME}" == v.docker.* ]]; then
4040
version="${GITHUB_REF_NAME#v.docker.}"
4141
tag="v${version}"
42-
elif [[ "${{ github.ref_name }}" == build-* ]]; then
42+
elif [[ "${GITHUB_REF_NAME}" == build-* ]]; then
4343
tag="${GITHUB_REF_NAME#build-}"
4444
else
45-
echo "Invalid git tag: ${{ github.ref_name }}"
45+
echo "Invalid git tag: ${GITHUB_REF_NAME}"
4646
exit 1
4747
fi
48-
elif [[ "${{ github.ref_name }}" == "main" ]]; then
48+
elif [[ "${GITHUB_REF_NAME}" == "main" ]]; then
4949
tag="main"
5050
else
51-
echo "Invalid git ref: ${{ github.ref }}"
51+
echo "Invalid git ref: ${GITHUB_REF}"
5252
exit 1
5353
fi
5454
echo "tag=${tag}" >> "$GITHUB_OUTPUT"
55+
env:
56+
INPUTS_TAG: ${{ inputs.tag }}
5557

5658
- name: 🔍 Check for validity
5759
id: check_validity

.github/workflows/changesets-pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
if: github.repository == 'triggerdotdev/trigger.dev'
2626
steps:
2727
- name: Checkout
28-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
28+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 # zizmor: ignore[artipacked] changesets/action pushes the release branch; no artifact upload here so no leak path
2929
with:
3030
fetch-depth: 0
3131

.github/workflows/claude-md-audit.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,13 @@ jobs:
3030
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
3131
with:
3232
fetch-depth: 0
33+
persist-credentials: false
3334

3435
- name: Run Claude Code
3536
id: claude
3637
uses: anthropics/claude-code-action@fefa07e9c665b7320f08c3b525980457f22f58aa # v1.0.111
3738
with:
38-
claude_code_oauth_token: ${{ secrets.CLAUDE_CODE_OAUTH_TOKEN }}
39+
anthropic_api_key: ${{ secrets.ANTHROPIC_API_KEY }}
3940
use_sticky_comment: true
4041
allowed_bots: "devin-ai-integration[bot]"
4142

.github/workflows/claude.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,17 @@ jobs:
1919
(github.event_name == 'issues' && (contains(github.event.issue.body, '@claude') || contains(github.event.issue.title, '@claude')))
2020
runs-on: ubuntu-latest
2121
permissions:
22-
contents: read
23-
pull-requests: read
24-
issues: read
22+
contents: write
23+
pull-requests: write
24+
issues: write
2525
id-token: write
2626
actions: read # Required for Claude to read CI results on PRs
2727
steps:
2828
- name: Checkout repository
2929
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
3030
with:
3131
fetch-depth: 1
32+
persist-credentials: false
3233

3334
- name: ⎔ Setup pnpm
3435
uses: pnpm/action-setup@fc06bc1257f339d1d5d8b3a19a8cae5388b55320 # v5.0.0
@@ -51,7 +52,7 @@ jobs:
5152
id: claude
5253
uses: anthropics/claude-code-action@fefa07e9c665b7320f08c3b525980457f22f58aa # v1.0.111
5354
with:
54-
claude_code_oauth_token: ${{ secrets.CLAUDE_CODE_OAUTH_TOKEN }}
55+
anthropic_api_key: ${{ secrets.ANTHROPIC_API_KEY }}
5556

5657
# This is an optional setting that allows Claude to read CI results on PRs
5758
additional_permissions: |

.github/workflows/docs.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ jobs:
2727
steps:
2828
- name: 📥 Checkout repository
2929
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
30+
with:
31+
persist-credentials: false
3032

3133
- name: 📦 Cache npm
3234
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5

.github/workflows/e2e-webapp.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@ permissions:
55

66
on:
77
workflow_call:
8+
secrets:
9+
DOCKERHUB_USERNAME:
10+
required: false
11+
DOCKERHUB_TOKEN:
12+
required: false
813

914
jobs:
1015
e2eTests:
@@ -44,6 +49,7 @@ jobs:
4449
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
4550
with:
4651
fetch-depth: 0
52+
persist-credentials: false
4753

4854
- name: ⎔ Setup pnpm
4955
uses: pnpm/action-setup@fc06bc1257f339d1d5d8b3a19a8cae5388b55320 # v5.0.0

.github/workflows/e2e.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ jobs:
2727
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2828
with:
2929
fetch-depth: 0
30+
persist-credentials: false
3031

3132
- name: ⎔ Setup pnpm
3233
uses: pnpm/action-setup@fc06bc1257f339d1d5d8b3a19a8cae5388b55320 # v5.0.0

.github/workflows/helm-prerelease.yml

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ jobs:
3434
steps:
3535
- name: Checkout
3636
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
37+
with:
38+
persist-credentials: false
3739

3840
- name: Set up Helm
3941
uses: azure/setup-helm@dda3372f752e03dde6b3237bc9431cdc2f7a02a2 # v5.0.0
@@ -78,6 +80,8 @@ jobs:
7880
steps:
7981
- name: Checkout
8082
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
83+
with:
84+
persist-credentials: false
8185

8286
- name: Set up Helm
8387
uses: azure/setup-helm@dda3372f752e03dde6b3237bc9431cdc2f7a02a2 # v5.0.0
@@ -108,11 +112,11 @@ jobs:
108112
SHORT_SHA=$(echo "${{ github.event.pull_request.head.sha }}" | cut -c1-7)
109113
PRERELEASE_VERSION="${BASE_VERSION}-pr${PR_NUMBER}.${SHORT_SHA}"
110114
elif [[ "${{ github.event_name }}" == "push" ]]; then
111-
SHORT_SHA=$(echo "${{ github.sha }}" | cut -c1-7)
115+
SHORT_SHA=$(echo "${GITHUB_SHA}" | cut -c1-7)
112116
PRERELEASE_VERSION="${BASE_VERSION}-main.${SHORT_SHA}"
113117
else
114-
SHORT_SHA=$(echo "${{ github.sha }}" | cut -c1-7)
115-
REF_SLUG=$(echo "${{ github.ref_name }}" | tr '/' '-' | tr -cd 'a-zA-Z0-9-')
118+
SHORT_SHA=$(echo "${GITHUB_SHA}" | cut -c1-7)
119+
REF_SLUG=$(echo "${GITHUB_REF_NAME}" | tr '/' '-' | tr -cd 'a-zA-Z0-9-')
116120
if [[ -z "$REF_SLUG" ]]; then
117121
REF_SLUG="manual"
118122
fi
@@ -123,7 +127,9 @@ jobs:
123127
124128
- name: Update Chart.yaml with prerelease version
125129
run: |
126-
sed -i "s/^version:.*/version: ${{ steps.version.outputs.version }}/" ./hosting/k8s/helm/Chart.yaml
130+
sed -i "s/^version:.*/version: ${STEPS_VERSION_OUTPUTS_VERSION}/" ./hosting/k8s/helm/Chart.yaml
131+
env:
132+
STEPS_VERSION_OUTPUTS_VERSION: ${{ steps.version.outputs.version }}
127133

128134
- name: Override appVersion
129135
if: github.event_name == 'workflow_dispatch' && inputs.app_version != ''
@@ -138,26 +144,30 @@ jobs:
138144
139145
- name: Push Helm Chart to GHCR
140146
run: |
141-
VERSION="${{ steps.version.outputs.version }}"
147+
VERSION="${STEPS_VERSION_OUTPUTS_VERSION}"
142148
CHART_PACKAGE="/tmp/${{ env.CHART_NAME }}-${VERSION}.tgz"
143149
144150
# Push to GHCR OCI registry
145151
helm push "$CHART_PACKAGE" "oci://${{ env.REGISTRY }}/${{ github.repository_owner }}/charts"
152+
env:
153+
STEPS_VERSION_OUTPUTS_VERSION: ${{ steps.version.outputs.version }}
146154

147155
- name: Write run summary
148156
run: |
149157
{
150158
echo "### 🧭 Helm Chart Prerelease Published"
151159
echo ""
152-
echo "**Version:** \`${{ steps.version.outputs.version }}\`"
160+
echo "**Version:** \`${STEPS_VERSION_OUTPUTS_VERSION}\`"
153161
echo ""
154162
echo "**Install:**"
155163
echo '```bash'
156164
echo "helm upgrade --install trigger \\"
157165
echo " oci://${{ env.REGISTRY }}/${{ github.repository_owner }}/charts/${{ env.CHART_NAME }} \\"
158-
echo " --version \"${{ steps.version.outputs.version }}\""
166+
echo " --version \"${STEPS_VERSION_OUTPUTS_VERSION}\""
159167
echo '```'
160168
} >> "$GITHUB_STEP_SUMMARY"
169+
env:
170+
STEPS_VERSION_OUTPUTS_VERSION: ${{ steps.version.outputs.version }}
161171

162172
- name: Find existing comment
163173
if: github.event_name == 'pull_request'

.github/workflows/pr_checks.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,23 +15,21 @@ concurrency:
1515

1616
permissions:
1717
contents: read
18-
id-token: write
1918

2019
jobs:
2120
typecheck:
2221
uses: ./.github/workflows/typecheck.yml
23-
secrets: inherit
2422

2523
units:
2624
uses: ./.github/workflows/unit-tests.yml
27-
secrets: inherit
25+
secrets:
26+
DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
27+
DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
2828

2929
e2e:
3030
uses: ./.github/workflows/e2e.yml
3131
with:
3232
package: cli-v3
33-
secrets: inherit
3433

3534
sdk-compat:
3635
uses: ./.github/workflows/sdk-compat.yml
37-
secrets: inherit

0 commit comments

Comments
 (0)