Skip to content

Commit e0998e6

Browse files
mpcgridmpcgrid
authored
Merge branch 'main' into fix/tri-6732-hover-vertical-timeline-does-not-update-on-task-runs
2 parents f99c780 + e536d35 commit e0998e6

File tree

19 files changed

+556
-73
lines changed

19 files changed

+556
-73
lines changed

‎.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

‎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

‎apps/kubernetes-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 kubernetes-provider build:bundle
34+
RUN pnpm run -r --filter @trigger.dev/core bundle-vendor && pnpm run -r --filter kubernetes-provider build:bundle
3535

3636
FROM base AS runner
3737

‎apps/webapp/app/components/AskAI.tsx‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -118,30 +118,31 @@ function AskAIProvider({ websiteId, isCollapsed = false }: AskAIProviderProps) {
118118
<motion.div layout="position" transition={{ duration: 0.2, ease: "easeInOut" }}>
119119
<TooltipProvider disableHoverableContent>
120120
<Tooltip>
121-
<div className={isCollapsed ? "w-full" : "inline-flex"}>
122-
<TooltipTrigger asChild>
121+
<TooltipTrigger asChild>
122+
<span className={cn("inline-flex h-8", isCollapsed && "w-full")}>
123123
<Button
124124
variant="small-menu-item"
125125
data-action="ask-ai"
126-
shortcut={{ modifiers: ["mod"], key: "/", enabledOnInputElements: true }}
126+
shortcut={{ modifiers: ["mod"], key: "i", enabledOnInputElements: true }}
127127
hideShortcutKey
128128
data-modal-override-open-class-ask-ai="true"
129129
onClick={() => openAskAI()}
130-
className={isCollapsed ? "w-full justify-center" : ""}
130+
fullWidth={isCollapsed}
131+
className={cn("h-full", isCollapsed && "justify-center")}
131132
>
132133
<AISparkleIcon className="size-5" />
133134
</Button>
134-
</TooltipTrigger>
135-
</div>
135+
</span>
136+
</TooltipTrigger>
136137
<TooltipContent
137-
side={isCollapsed ? "right" : "top"}
138-
sideOffset={isCollapsed ? 8 : 4}
139-
className="flex items-center gap-1 py-1.5 pl-2.5 pr-2 text-xs"
138+
side="right"
139+
sideOffset={8}
140+
className="flex items-center gap-2 text-xs"
140141
>
141142
Ask AI
142143
<span className="flex items-center">
143144
<ShortcutKey shortcut={{ modifiers: ["mod"] }} variant="medium/bright" />
144-
<ShortcutKey shortcut={{ key: "/" }} variant="medium/bright" />
145+
<ShortcutKey shortcut={{ key: "i" }} variant="medium/bright" />
145146
</span>
146147
</TooltipContent>
147148
</Tooltip>

‎apps/webapp/app/components/Shortcuts.tsx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,8 @@ function ShortcutContent() {
7676
<ShortcutKey shortcut={{ key: "enter" }} variant="medium/bright" />
7777
</Shortcut>
7878
<Shortcut name="Ask AI">
79-
<ShortcutKey shortcut={{ modifiers: ["mod"], key: "/" }} variant="medium/bright" />
79+
<ShortcutKey shortcut={{ modifiers: ["mod"] }} variant="medium/bright" />
80+
<ShortcutKey shortcut={{ key: "i" }} variant="medium/bright" />
8081
</Shortcut>
8182
<Shortcut name="Filter">
8283
<ShortcutKey shortcut={{ key: "f" }} variant="medium/bright" />

‎apps/webapp/app/components/navigation/SideMenu.tsx‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -993,7 +993,10 @@ function CollapseToggle({
993993
return (
994994
<div className="absolute -right-3 top-1/2 z-10 -translate-y-1/2">
995995
{/* Vertical line to mask the side menu border */}
996-
<div className="pointer-events-none absolute left-1/2 top-1/2 h-10 w-px -translate-y-1/2 bg-background-bright" />
996+
<div className={cn(
997+
"pointer-events-none absolute left-1/2 top-1/2 h-10 w-px -translate-y-1/2 transition-colors duration-200",
998+
isHovering ? "bg-charcoal-750" : "bg-background-bright"
999+
)} />
9971000
<TooltipProvider disableHoverableContent>
9981001
<Tooltip>
9991002
<TooltipTrigger asChild>

‎apps/webapp/app/presenters/v3/DeploymentPresenter.server.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,7 @@ export class DeploymentPresenter {
156156
},
157157
},
158158
buildServerMetadata: true,
159+
triggeredVia: true,
159160
},
160161
});
161162

@@ -225,6 +226,7 @@ export class DeploymentPresenter {
225226
isBuilt: !!deployment.builtAt,
226227
type: deployment.type,
227228
git: gitMetadata,
229+
triggeredVia: deployment.triggeredVia,
228230
},
229231
};
230232
}

‎apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.deployments.$deploymentParam/route.tsx‎

Lines changed: 109 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,16 @@ import { type LoaderFunctionArgs } from "@remix-run/server-runtime";
33
import { typedjson, useTypedLoaderData } from "remix-typedjson";
44
import { useEffect, useState, useRef, useCallback } from "react";
55
import { S2, S2Error } from "@s2-dev/streamstore";
6-
import { Clipboard, ClipboardCheck, ChevronDown, ChevronUp } from "lucide-react";
6+
import {
7+
Clipboard,
8+
ClipboardCheck,
9+
ChevronDown,
10+
ChevronUp,
11+
TerminalSquareIcon,
12+
LayoutDashboardIcon,
13+
GitBranchIcon,
14+
ServerIcon,
15+
} from "lucide-react";
716
import { ExitIcon } from "~/assets/icons/ExitIcon";
817
import { GitMetadata } from "~/components/GitMetadata";
918
import { RuntimeIcon } from "~/components/RuntimeIcon";
@@ -73,6 +82,90 @@ type LogEntry = {
7382
level: "info" | "error" | "warn" | "debug";
7483
};
7584

85+
function getTriggeredViaDisplay(triggeredVia: string | null | undefined): {
86+
icon: React.ReactNode;
87+
label: string;
88+
} | null {
89+
if (!triggeredVia) return null;
90+
91+
const iconClass = "size-4 text-text-dimmed";
92+
93+
switch (triggeredVia) {
94+
case "cli:manual":
95+
return {
96+
icon: <TerminalSquareIcon className={iconClass} />,
97+
label: "CLI (Manual)",
98+
};
99+
case "cli:github_actions":
100+
return {
101+
icon: <GitBranchIcon className={iconClass} />,
102+
label: "CLI (GitHub Actions)",
103+
};
104+
case "cli:gitlab_ci":
105+
return {
106+
icon: <ServerIcon className={iconClass} />,
107+
label: "CLI (GitLab CI)",
108+
};
109+
case "cli:circleci":
110+
return {
111+
icon: <ServerIcon className={iconClass} />,
112+
label: "CLI (CircleCI)",
113+
};
114+
case "cli:jenkins":
115+
return {
116+
icon: <ServerIcon className={iconClass} />,
117+
label: "CLI (Jenkins)",
118+
};
119+
case "cli:azure_pipelines":
120+
return {
121+
icon: <ServerIcon className={iconClass} />,
122+
label: "CLI (Azure Pipelines)",
123+
};
124+
case "cli:bitbucket_pipelines":
125+
return {
126+
icon: <ServerIcon className={iconClass} />,
127+
label: "CLI (Bitbucket Pipelines)",
128+
};
129+
case "cli:travis_ci":
130+
return {
131+
icon: <ServerIcon className={iconClass} />,
132+
label: "CLI (Travis CI)",
133+
};
134+
case "cli:buildkite":
135+
return {
136+
icon: <ServerIcon className={iconClass} />,
137+
label: "CLI (Buildkite)",
138+
};
139+
case "cli:ci_other":
140+
return {
141+
icon: <ServerIcon className={iconClass} />,
142+
label: "CLI (CI)",
143+
};
144+
case "git_integration:github":
145+
return {
146+
icon: <GitBranchIcon className={iconClass} />,
147+
label: "GitHub Integration",
148+
};
149+
case "dashboard":
150+
return {
151+
icon: <LayoutDashboardIcon className={iconClass} />,
152+
label: "Dashboard",
153+
};
154+
default:
155+
// Handle any unknown values gracefully
156+
if (triggeredVia.startsWith("cli:")) {
157+
return {
158+
icon: <TerminalSquareIcon className={iconClass} />,
159+
label: `CLI (${triggeredVia.replace("cli:", "")})`,
160+
};
161+
}
162+
return {
163+
icon: <ServerIcon className={iconClass} />,
164+
label: triggeredVia,
165+
};
166+
}
167+
}
168+
76169
export default function Page() {
77170
const { deployment, eventStream } = useTypedLoaderData<typeof loader>();
78171
const organization = useOrganization();
@@ -408,6 +501,21 @@ export default function Page() {
408501
)}
409502
</Property.Value>
410503
</Property.Item>
504+
<Property.Item>
505+
<Property.Label>Triggered via</Property.Label>
506+
<Property.Value>
507+
{(() => {
508+
const display = getTriggeredViaDisplay(deployment.triggeredVia);
509+
if (!display) return "–";
510+
return (
511+
<span className="flex items-center gap-1.5">
512+
{display.icon}
513+
{display.label}
514+
</span>
515+
);
516+
})()}
517+
</Property.Value>
518+
</Property.Item>
411519
</Property.Table>
412520
</div>
413521

‎apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.queues/route.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -364,14 +364,14 @@ export default function Page() {
364364
/>
365365
</div>
366366
}
367-
valueClassName={env.paused ? "text-warning" : undefined}
367+
valueClassName={cn(env.paused ? "text-warning" : undefined, "tabular-nums")}
368368
compactThreshold={1000000}
369369
/>
370370
<BigNumber
371371
title="Running"
372372
value={environment.running}
373373
animate
374-
valueClassName={limitClassName}
374+
valueClassName={cn(limitClassName, "tabular-nums")}
375375
suffix={
376376
limitStatus === "burst" ? (
377377
<span className={cn(limitClassName, "flex items-center gap-1")}>

0 commit comments

Comments
 (0)