Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .changeset/fluffy-weeks-sleep.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"trigger.dev": patch
"@trigger.dev/core": patch
---

The new `triggeredVia` field is now populated in deployments via the CLI.
11 changes: 9 additions & 2 deletions apps/webapp/app/presenters/v3/DeploymentPresenter.server.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import {
BuildServerMetadata,
DeploymentErrorData,
ExternalBuildData,
prepareDeploymentError,
Expand Down Expand Up @@ -154,17 +155,23 @@ export class DeploymentPresenter {
avatarUrl: true,
},
},
buildServerMetadata: true,
},
});

const gitMetadata = processGitMetadata(deployment.git);

const externalBuildData = deployment.externalBuildData
? ExternalBuildData.safeParse(deployment.externalBuildData)
: undefined;
const buildServerMetadata = deployment.buildServerMetadata
? BuildServerMetadata.safeParse(deployment.buildServerMetadata)
: undefined;

let eventStream = undefined;
if (env.S2_ENABLED === "1" && gitMetadata?.source === "trigger_github_app") {
if (
env.S2_ENABLED === "1" &&
(buildServerMetadata || gitMetadata?.source === "trigger_github_app")
) {
const [error, accessToken] = await tryCatch(this.getS2AccessToken(project.externalRef));

if (error) {
Expand Down
19 changes: 18 additions & 1 deletion apps/webapp/app/v3/services/initializeDeployment.server.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { type InitializeDeploymentRequestBody } from "@trigger.dev/core/v3";
import { BuildServerMetadata, type InitializeDeploymentRequestBody } from "@trigger.dev/core/v3";
import { customAlphabet } from "nanoid";
import { env } from "~/env.server";
import { type AuthenticatedEnvironment } from "~/services/apiAuth.server";
Expand Down Expand Up @@ -190,6 +190,21 @@ export class InitializeDeploymentService extends BaseService {
isNativeBuild: payload.isNativeBuild,
});

const buildServerMetadata: BuildServerMetadata | undefined =
payload.isNativeBuild || payload.buildId
? {
buildId: payload.buildId,
...(payload.isNativeBuild
? {
isNativeBuild: payload.isNativeBuild,
artifactKey: payload.artifactKey,
skipPromotion: payload.skipPromotion,
configFilePath: payload.configFilePath,
}
: {}),
}
: undefined;

const deployment = await this._prisma.workerDeployment.create({
data: {
friendlyId: generateFriendlyId("deployment"),
Expand All @@ -200,12 +215,14 @@ export class InitializeDeploymentService extends BaseService {
environmentId: environment.id,
projectId: environment.projectId,
externalBuildData,
buildServerMetadata,
triggeredById: triggeredBy?.id,
type: payload.type,
imageReference: imageRef,
imagePlatform: env.DEPLOY_IMAGE_PLATFORM,
git: payload.gitMeta ?? undefined,
runtime: payload.runtime ?? undefined,
triggeredVia: payload.triggeredVia ?? undefined,
startedAt: initialStatus === "BUILDING" ? new Date() : undefined,
},
});
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ALTER TABLE "public"."WorkerDeployment" ADD COLUMN "buildServerMetadata" JSONB;
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ALTER TABLE "public"."WorkerDeployment" ADD COLUMN "triggeredVia" TEXT;
2 changes: 2 additions & 0 deletions internal-packages/database/prisma/schema.prisma
Original file line number Diff line number Diff line change
Expand Up @@ -1749,6 +1749,7 @@ model WorkerDeployment {
imagePlatform String @default("linux/amd64")

externalBuildData Json?
buildServerMetadata Json?

status WorkerDeploymentStatus @default(PENDING)
type WorkerDeploymentType @default(V1)
Expand All @@ -1764,6 +1765,7 @@ model WorkerDeployment {

triggeredBy User? @relation(fields: [triggeredById], references: [id], onDelete: SetNull, onUpdate: Cascade)
triggeredById String?
triggeredVia String?

startedAt DateTime?
installedAt DateTime?
Expand Down
39 changes: 38 additions & 1 deletion packages/cli-v3/src/commands/deploy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import {
GitMeta,
DeploymentFinalizedEvent,
DeploymentEventFromString,
DeploymentTriggeredVia,
} from "@trigger.dev/core/v3/schemas";
import { Command, Option as CommandOption } from "commander";
import { join, relative, resolve } from "node:path";
Expand Down Expand Up @@ -48,7 +49,7 @@ import {
import { loadDotEnvVars } from "../utilities/dotEnv.js";
import { isDirectory } from "../utilities/fileSystem.js";
import { setGithubActionsOutputAndEnvVars } from "../utilities/githubActions.js";
import { createGitMeta } from "../utilities/gitMeta.js";
import { createGitMeta, isGitHubActions } from "../utilities/gitMeta.js";
import { printStandloneInitialBanner } from "../utilities/initialBanner.js";
import { resolveLocalEnvVars } from "../utilities/localEnvVars.js";
import { logger } from "../utilities/logger.js";
Expand Down Expand Up @@ -382,6 +383,7 @@ async function _deployCommand(dir: string, options: DeployCommandOptions) {
type: features.run_engine_v2 ? "MANAGED" : "V1",
runtime: buildManifest.runtime,
isNativeBuild: false,
triggeredVia: getTriggeredVia(),
},
envVars.TRIGGER_EXISTING_DEPLOYMENT_ID
);
Expand Down Expand Up @@ -893,6 +895,40 @@ async function initializeOrAttachDeployment(
return newDeploymentOrError.data;
}

function getTriggeredVia(): DeploymentTriggeredVia {
// Check specific CI providers first (most specific to least specific)
if (isGitHubActions()) {
return "cli:github_actions";
}
if (process.env.GITLAB_CI === "true") {
return "cli:gitlab_ci";
}
if (process.env.CIRCLECI === "true") {
return "cli:circleci";
}
if (process.env.JENKINS_URL) {
return "cli:jenkins";
}
if (process.env.TF_BUILD === "True") {
return "cli:azure_pipelines";
}
if (process.env.BITBUCKET_BUILD_NUMBER) {
return "cli:bitbucket_pipelines";
}
if (process.env.TRAVIS === "true") {
return "cli:travis_ci";
}
if (process.env.BUILDKITE === "true") {
return "cli:buildkite";
}
// Fallback for other/unknown CI environments
if (isCI) {
return "cli:ci_other";
}

return "cli:manual";
}

async function handleNativeBuildServerDeploy({
apiClient,
options,
Expand Down Expand Up @@ -998,6 +1034,7 @@ async function handleNativeBuildServerDeploy({
artifactKey,
skipPromotion: options.skipPromotion,
configFilePath,
triggeredVia: getTriggeredVia(),
});

if (!initializeDeploymentResult.success) {
Expand Down
2 changes: 1 addition & 1 deletion packages/cli-v3/src/utilities/gitMeta.ts
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ function errorToString(err: unknown): string {
return err instanceof Error ? err.message : String(err);
}

function isGitHubActions() {
export function isGitHubActions() {
// GH Actions CI sets these env variables
return (
process.env.GITHUB_ACTIONS === "true" &&
Expand Down
35 changes: 33 additions & 2 deletions packages/core/src/v3/schemas/api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -400,6 +400,37 @@ export const ExternalBuildData = z.object({

export type ExternalBuildData = z.infer<typeof ExternalBuildData>;

const anyString = z.custom<string & {}>((v) => typeof v === "string");

export const DeploymentTriggeredVia = z
.enum([
"cli:manual",
"cli:ci_other",
"cli:github_actions",
"cli:gitlab_ci",
"cli:circleci",
"cli:jenkins",
"cli:azure_pipelines",
"cli:bitbucket_pipelines",
"cli:travis_ci",
"cli:buildkite",
"git_integration:github",
"dashboard",
])
.or(anyString);

export type DeploymentTriggeredVia = z.infer<typeof DeploymentTriggeredVia>;

export const BuildServerMetadata = z.object({
buildId: z.string().optional(),
isNativeBuild: z.boolean().optional(),
artifactKey: z.string().optional(),
skipPromotion: z.boolean().optional(),
configFilePath: z.string().optional(),
});

export type BuildServerMetadata = z.infer<typeof BuildServerMetadata>;

export const UpsertBranchRequestBody = z.object({
git: GitMeta.optional(),
env: z.enum(["preview"]),
Expand Down Expand Up @@ -462,6 +493,8 @@ export const InitializeDeploymentRequestBody = z
type: z.enum(["MANAGED", "UNMANAGED", "V1"]).optional(),
runtime: z.string().optional(),
initialStatus: z.enum(["PENDING", "BUILDING"]).optional(),
triggeredVia: DeploymentTriggeredVia.optional(),
buildId: z.string().optional(),
})
.and(
z.preprocess(
Expand Down Expand Up @@ -587,8 +620,6 @@ export const DeploymentLogEvent = z.object({
}),
});

const anyString = z.custom<string & {}>((v) => typeof v === "string");

export const DeploymentFinalizedEvent = z.object({
type: z.literal("finalized"),
data: z.object({
Expand Down