Merge branch 'main' into only-promote-successful-builds

coder · aslilac · Oct 5, 2023 · Oct 2, 2023 · Oct 2, 2023 · Oct 2, 2023
commit dcdeed230f3fd17ec664c6fc89df218a0c950385
diff --git a/coderd/coderdtest/coderdtest.go b/coderd/coderdtest/coderdtest.go
@@ -760,6 +760,7 @@ func UpdateTemplateVersion(t *testing.T, client *codersdk.Client, organizationID
 	return templateVersion
 }
 
+// AwaitTemplateVersionJobRunning waits for the build to be picked up by a provisioner.
 func AwaitTemplateVersionJobRunning(t *testing.T, client *codersdk.Client, version uuid.UUID) codersdk.TemplateVersion {
 	t.Helper()
 
@@ -789,7 +790,8 @@ func AwaitTemplateVersionJobRunning(t *testing.T, client *codersdk.Client, versi
 	return templateVersion
 }
 
-// AwaitTemplateImportJobCompleted awaits for an import job to reach completed status.
+// AwaitTemplateVersionJobCompleted waits for the build to be completed. This may result
+// from cancelation, an error, or from completing successfully.
 func AwaitTemplateVersionJobCompleted(t *testing.T, client *codersdk.Client, version uuid.UUID) codersdk.TemplateVersion {
 	t.Helper()
 

diff --git a/site/src/components/Pill/Pill.tsx b/site/src/components/Pill/Pill.tsx
@@ -1,14 +1,21 @@
-import { type PaletteColor, type Theme } from "@mui/material/styles";
-import { makeStyles } from "@mui/styles";
-import { type FC, type ReactNode } from "react";
-import { type PaletteIndex } from "theme/theme";
-import { combineClasses } from "utils/combineClasses";
+import { type FC, type ReactNode, useMemo } from "react";
+import { css, type Interpolation, type Theme, useTheme } from "@emotion/react";
+import { colors } from "theme/colors";
+
+export type PillType =
+  | "primary"
+  | "secondary"
+  | "error"
+  | "warning"
+  | "info"
+  | "success"
+  | "neutral";
 
 export interface PillProps {
   className?: string;
   icon?: ReactNode;
   text: ReactNode;
-  type?: PaletteIndex;
+  type?: PillType;
   lightBorder?: boolean;
   title?: string;
 }