Skip to content

Commit f9887cf

Browse files
authored
Merge branch 'main' into feat(webapp)-imrpoved-incident-notification
2 parents bcb2654 + 6e3ac8b commit f9887cf

File tree

106 files changed

+9453
-335
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

106 files changed

+9453
-335
lines changed

.changeset/vercel-integration.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@trigger.dev/core": patch
3+
---
4+
5+
Add Vercel integration support to API schemas: `commitSHA` and `integrationDeployments` on deployment responses, and `source` field for environment variable imports.
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
name: Vouch Request
2+
description: Request to be vouched as a contributor
3+
labels: ["vouch-request"]
4+
body:
5+
- type: markdown
6+
attributes:
7+
value: |
8+
## Vouch Request
9+
10+
We use [vouch](https://github.com/mitchellh/vouch) to manage contributor trust. PRs from unvouched users are automatically closed.
11+
12+
To get vouched, fill out this form. A maintainer will review your request and vouch for you by commenting on this issue.
13+
- type: textarea
14+
id: context
15+
attributes:
16+
label: Why do you want to contribute?
17+
description: Tell us a bit about yourself and what you'd like to work on.
18+
placeholder: "I'd like to fix a bug I found in..."
19+
validations:
20+
required: true
21+
- type: textarea
22+
id: prior-work
23+
attributes:
24+
label: Prior contributions or relevant experience
25+
description: Links to previous open source work, relevant projects, or anything that helps us understand your background.
26+
placeholder: "https://github.com/..."
27+
validations:
28+
required: false

.github/VOUCHED.td

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# Vouched contributors for Trigger.dev
2+
# See: https://github.com/mitchellh/vouch
3+
#
4+
# Org members
5+
0ski
6+
D-K-P
7+
ericallam
8+
matt-aitken
9+
mpcgrid
10+
myftija
11+
nicktrn
12+
samejr
13+
isshaddad

.github/workflows/release.yml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,14 +122,24 @@ jobs:
122122
package_version=$(echo '${{ steps.changesets.outputs.publishedPackages }}' | jq -r '.[0].version')
123123
echo "package_version=${package_version}" >> "$GITHUB_OUTPUT"
124124
125-
# this triggers the publish workflow for the docker images
126125
- name: Create and push Docker tag
127126
if: steps.changesets.outputs.published == 'true'
128127
run: |
129128
set -e
130129
git tag "v.docker.${{ steps.get_version.outputs.package_version }}"
131130
git push origin "v.docker.${{ steps.get_version.outputs.package_version }}"
132131
132+
# Trigger Docker builds directly via workflow_call since tags pushed with
133+
# GITHUB_TOKEN don't trigger other workflows (GitHub Actions limitation).
134+
publish-docker:
135+
name: 🐳 Publish Docker images
136+
needs: release
137+
if: needs.release.outputs.published == 'true'
138+
uses: ./.github/workflows/publish.yml
139+
secrets: inherit
140+
with:
141+
image_tag: v${{ needs.release.outputs.published_package_version }}
142+
133143
# The prerelease job needs to be on the same workflow file due to a limitation related to how npm verifies OIDC claims.
134144
prerelease:
135145
name: 🧪 Prerelease
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
name: Vouch - Check PR
2+
3+
on:
4+
pull_request_target:
5+
types: [opened, reopened]
6+
7+
permissions:
8+
contents: read
9+
pull-requests: write
10+
issues: read
11+
12+
jobs:
13+
check-pr:
14+
runs-on: ubuntu-latest
15+
steps:
16+
- uses: actions/checkout@v4
17+
- uses: mitchellh/vouch/action/check-pr@main
18+
with:
19+
pr-number: ${{ github.event.pull_request.number }}
20+
auto-close: true
21+
require-vouch: true
22+
env:
23+
GH_TOKEN: ${{ github.token }}
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
name: Vouch - Manage by Issue
2+
3+
on:
4+
issue_comment:
5+
types: [created]
6+
7+
permissions:
8+
contents: write
9+
issues: write
10+
11+
jobs:
12+
manage:
13+
runs-on: ubuntu-latest
14+
if: >-
15+
contains(github.event.comment.body, 'vouch') ||
16+
contains(github.event.comment.body, 'denounce') ||
17+
contains(github.event.comment.body, 'unvouch')
18+
steps:
19+
- uses: actions/checkout@v4
20+
- uses: mitchellh/vouch/action/manage-by-issue@main
21+
with:
22+
comment-id: ${{ github.event.comment.id }}
23+
issue-id: ${{ github.event.issue.number }}
24+
env:
25+
GH_TOKEN: ${{ github.token }}

.vscode/settings.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,6 @@
77
"packages/cli-v3/e2e": true
88
},
99
"vitest.disableWorkspaceWarning": true,
10-
"typescript.experimental.useTsgo": false
10+
"typescript.experimental.useTsgo": true,
11+
"chat.agent.maxRequests": 10000
1112
}

CONTRIBUTING.md

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,23 @@
22

33
Thank you for taking the time to contribute to Trigger.dev. Your involvement is not just welcomed, but we encourage it! 🚀
44

5-
Please take some time to read this guide to understand contributing best practices for Trigger.dev.
5+
Please take some time to read this guide to understand contributing best practices for Trigger.dev. Note that we use [vouch](https://github.com/mitchellh/vouch) to manage contributor trust, so you'll need to be vouched before opening a PR.
66

77
Thank you for helping us make Trigger.dev even better! 🤩
88

9+
## Getting vouched (required before opening a PR)
10+
11+
We use [vouch](https://github.com/mitchellh/vouch) to manage contributor trust. **PRs from unvouched users are automatically closed.**
12+
13+
Before you open your first pull request, you need to be vouched by a maintainer. Here's how:
14+
15+
1. Open a [Vouch Request](https://github.com/triggerdotdev/trigger.dev/issues/new?template=vouch-request.yml) issue.
16+
2. Tell us what you'd like to work on and share any relevant background.
17+
3. A maintainer will review your request and vouch for you by commenting on the issue.
18+
4. Once vouched, your PRs will be accepted normally.
19+
20+
If you're unsure whether you're already vouched, go ahead and open a PR — the check will tell you.
21+
922
## Developing
1023

1124
The development branch is `main`. This is the branch that all pull

apps/coordinator/Containerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ COPY --from=pruner --chown=node:node /app/out/full/ .
3535
COPY --from=dev-deps --chown=node:node /app/ .
3636
COPY --chown=node:node turbo.json turbo.json
3737

38-
RUN pnpm run -r --filter coordinator build:bundle
38+
RUN pnpm run -r --filter @trigger.dev/core bundle-vendor && pnpm run -r --filter coordinator build:bundle
3939

4040
FROM alpine AS cri-tools
4141

apps/docker-provider/Containerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ COPY --from=pruner --chown=node:node /app/out/full/ .
3131
COPY --from=dev-deps --chown=node:node /app/ .
3232
COPY --chown=node:node turbo.json turbo.json
3333

34-
RUN pnpm run -r --filter docker-provider build:bundle
34+
RUN pnpm run -r --filter @trigger.dev/core bundle-vendor && pnpm run -r --filter docker-provider build:bundle
3535

3636
FROM base AS runner
3737

0 commit comments

Comments
 (0)