From 2b3c9b8174399e3c04a24b5130365a010d636201 Mon Sep 17 00:00:00 2001 From: Louis Garman Date: Thu, 9 Jan 2025 18:26:56 +0000 Subject: [PATCH] wip --- Makefile | 4 +- internal/http/html/static/css/output.css | 369 +++++++++--------- .../templates/content/workspace_edit.tmpl | 5 + internal/run/spawner.go | 10 +- internal/run/spawner_test.go | 29 +- 5 files changed, 230 insertions(+), 187 deletions(-) diff --git a/Makefile b/Makefile index 1ac9ab0f9..0a7f29dba 100644 --- a/Makefile +++ b/Makefile @@ -32,11 +32,11 @@ modd: .PHONY: tailwind tailwind: - npx tailwindcss -i ./internal/http/html/static/css/input.css -o ./internal/http/html/static/css/output.css + pnpm exec tailwindcss -i ./internal/http/html/static/css/input.css -o ./internal/http/html/static/css/output.css .PHONY: tailwind-watch tailwind-watch: - +npx tailwindcss -i ./internal/http/html/static/css/input.css -o ./internal/http/html/static/css/output.css --watch + pnpm exec tailwindcss -i ./internal/http/html/static/css/input.css -o ./internal/http/html/static/css/output.css --watch .PHONY: test test: diff --git a/internal/http/html/static/css/output.css b/internal/http/html/static/css/output.css index 0b9061539..358cc3ab2 100644 --- a/internal/http/html/static/css/output.css +++ b/internal/http/html/static/css/output.css @@ -1,5 +1,113 @@ +*, ::before, ::after { + --tw-border-spacing-x: 0; + --tw-border-spacing-y: 0; + --tw-translate-x: 0; + --tw-translate-y: 0; + --tw-rotate: 0; + --tw-skew-x: 0; + --tw-skew-y: 0; + --tw-scale-x: 1; + --tw-scale-y: 1; + --tw-pan-x: ; + --tw-pan-y: ; + --tw-pinch-zoom: ; + --tw-scroll-snap-strictness: proximity; + --tw-gradient-from-position: ; + --tw-gradient-via-position: ; + --tw-gradient-to-position: ; + --tw-ordinal: ; + --tw-slashed-zero: ; + --tw-numeric-figure: ; + --tw-numeric-spacing: ; + --tw-numeric-fraction: ; + --tw-ring-inset: ; + --tw-ring-offset-width: 0px; + --tw-ring-offset-color: #fff; + --tw-ring-color: rgb(59 130 246 / 0.5); + --tw-ring-offset-shadow: 0 0 #0000; + --tw-ring-shadow: 0 0 #0000; + --tw-shadow: 0 0 #0000; + --tw-shadow-colored: 0 0 #0000; + --tw-blur: ; + --tw-brightness: ; + --tw-contrast: ; + --tw-grayscale: ; + --tw-hue-rotate: ; + --tw-invert: ; + --tw-saturate: ; + --tw-sepia: ; + --tw-drop-shadow: ; + --tw-backdrop-blur: ; + --tw-backdrop-brightness: ; + --tw-backdrop-contrast: ; + --tw-backdrop-grayscale: ; + --tw-backdrop-hue-rotate: ; + --tw-backdrop-invert: ; + --tw-backdrop-opacity: ; + --tw-backdrop-saturate: ; + --tw-backdrop-sepia: ; + --tw-contain-size: ; + --tw-contain-layout: ; + --tw-contain-paint: ; + --tw-contain-style: ; +} + +::backdrop { + --tw-border-spacing-x: 0; + --tw-border-spacing-y: 0; + --tw-translate-x: 0; + --tw-translate-y: 0; + --tw-rotate: 0; + --tw-skew-x: 0; + --tw-skew-y: 0; + --tw-scale-x: 1; + --tw-scale-y: 1; + --tw-pan-x: ; + --tw-pan-y: ; + --tw-pinch-zoom: ; + --tw-scroll-snap-strictness: proximity; + --tw-gradient-from-position: ; + --tw-gradient-via-position: ; + --tw-gradient-to-position: ; + --tw-ordinal: ; + --tw-slashed-zero: ; + --tw-numeric-figure: ; + --tw-numeric-spacing: ; + --tw-numeric-fraction: ; + --tw-ring-inset: ; + --tw-ring-offset-width: 0px; + --tw-ring-offset-color: #fff; + --tw-ring-color: rgb(59 130 246 / 0.5); + --tw-ring-offset-shadow: 0 0 #0000; + --tw-ring-shadow: 0 0 #0000; + --tw-shadow: 0 0 #0000; + --tw-shadow-colored: 0 0 #0000; + --tw-blur: ; + --tw-brightness: ; + --tw-contrast: ; + --tw-grayscale: ; + --tw-hue-rotate: ; + --tw-invert: ; + --tw-saturate: ; + --tw-sepia: ; + --tw-drop-shadow: ; + --tw-backdrop-blur: ; + --tw-backdrop-brightness: ; + --tw-backdrop-contrast: ; + --tw-backdrop-grayscale: ; + --tw-backdrop-hue-rotate: ; + --tw-backdrop-invert: ; + --tw-backdrop-opacity: ; + --tw-backdrop-saturate: ; + --tw-backdrop-sepia: ; + --tw-contain-size: ; + --tw-contain-layout: ; + --tw-contain-paint: ; + --tw-contain-style: ; +} + /* -! tailwindcss v3.3.5 | MIT License | https://tailwindcss.com +! tailwindcss v3.4.17 | MIT License | https://tailwindcss.com */ /* @@ -32,9 +140,11 @@ 4. Use the user's configured `sans` font-family by default. 5. Use the user's configured `sans` font-feature-settings by default. 6. Use the user's configured `sans` font-variation-settings by default. +7. Disable tap highlights on iOS */ -html { +html, +:host { line-height: 1.5; /* 1 */ -webkit-text-size-adjust: 100%; @@ -44,12 +154,14 @@ html { -o-tab-size: 4; tab-size: 4; /* 3 */ - font-family: ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"; + font-family: ui-sans-serif, system-ui, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"; /* 4 */ font-feature-settings: normal; /* 5 */ font-variation-settings: normal; /* 6 */ + -webkit-tap-highlight-color: transparent; + /* 7 */ } /* @@ -121,8 +233,10 @@ strong { } /* -1. Use the user's configured `mono` font family by default. -2. Correct the odd `em` font sizing in all browsers. +1. Use the user's configured `mono` font-family by default. +2. Use the user's configured `mono` font-feature-settings by default. +3. Use the user's configured `mono` font-variation-settings by default. +4. Correct the odd `em` font sizing in all browsers. */ code, @@ -131,8 +245,12 @@ samp, pre { font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace; /* 1 */ - font-size: 1em; + font-feature-settings: normal; /* 2 */ + font-variation-settings: normal; + /* 3 */ + font-size: 1em; + /* 4 */ } /* @@ -201,6 +319,8 @@ textarea { /* 1 */ line-height: inherit; /* 1 */ + letter-spacing: inherit; + /* 1 */ color: inherit; /* 1 */ margin: 0; @@ -224,9 +344,9 @@ select { */ button, -[type='button'], -[type='reset'], -[type='submit'] { +input:where([type='button']), +input:where([type='reset']), +input:where([type='submit']) { -webkit-appearance: button; /* 1 */ background-color: transparent; @@ -430,13 +550,13 @@ video { /* Make elements with the HTML hidden attribute stay hidden by default */ -[hidden] { +[hidden]:where(:not([hidden="until-found"])) { display: none; } a:hover { --tw-text-opacity: 1; - color: rgb(59 130 246 / var(--tw-text-opacity)); + color: rgb(59 130 246 / var(--tw-text-opacity, 1)); text-decoration-line: underline; } @@ -446,7 +566,7 @@ a:hover { .btn { --tw-bg-opacity: 1; - background-color: rgb(229 231 235 / var(--tw-bg-opacity)); + background-color: rgb(229 231 235 / var(--tw-bg-opacity, 1)); padding-top: 0.25rem; padding-bottom: 0.25rem; padding-left: 0.75rem; @@ -461,19 +581,19 @@ a:hover { .btn:hover { --tw-bg-opacity: 1; - background-color: rgb(209 213 219 / var(--tw-bg-opacity)); + background-color: rgb(209 213 219 / var(--tw-bg-opacity, 1)); } .btn-danger { --tw-bg-opacity: 1; - background-color: rgb(229 231 235 / var(--tw-bg-opacity)); + background-color: rgb(229 231 235 / var(--tw-bg-opacity, 1)); padding-top: 0.25rem; padding-bottom: 0.25rem; padding-left: 0.75rem; padding-right: 0.75rem; font-weight: 700; --tw-text-opacity: 1; - color: rgb(248 113 113 / var(--tw-text-opacity)); + color: rgb(248 113 113 / var(--tw-text-opacity, 1)); --tw-shadow: 0 1px 2px 0 rgb(0 0 0 / 0.05); --tw-shadow-colored: 0 1px 2px 0 var(--tw-shadow-color); box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow); @@ -483,9 +603,9 @@ a:hover { .btn-danger:hover { --tw-bg-opacity: 1; - background-color: rgb(248 113 113 / var(--tw-bg-opacity)); + background-color: rgb(248 113 113 / var(--tw-bg-opacity, 1)); --tw-text-opacity: 1; - color: rgb(255 255 255 / var(--tw-text-opacity)); + color: rgb(255 255 255 / var(--tw-text-opacity, 1)); } .text-input { @@ -515,7 +635,7 @@ a:hover { input.error { border-width: 2px; --tw-border-opacity: 1; - border-color: rgb(248 113 113 / var(--tw-border-opacity)); + border-color: rgb(248 113 113 / var(--tw-border-opacity, 1)); --tw-shadow: 0 1px 2px 0 rgb(0 0 0 / 0.05); --tw-shadow-colored: 0 1px 2px 0 var(--tw-shadow-color); box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow); @@ -526,7 +646,7 @@ input.error { select { cursor: pointer; --tw-bg-opacity: 1; - background-color: rgb(229 231 235 / var(--tw-bg-opacity)); + background-color: rgb(229 231 235 / var(--tw-bg-opacity, 1)); padding-top: 0.5rem; padding-bottom: 0.5rem; padding-left: 1rem; @@ -548,7 +668,7 @@ label { #content-header-title a { --tw-text-opacity: 1; - color: rgb(37 99 235 / var(--tw-text-opacity)); + color: rgb(37 99 235 / var(--tw-text-opacity, 1)); } .widget { @@ -559,7 +679,7 @@ label { gap: 0.75rem; border-width: 1px; --tw-border-opacity: 1; - border-color: rgb(0 0 0 / var(--tw-border-opacity)); + border-color: rgb(0 0 0 / var(--tw-border-opacity, 1)); padding: 0.5rem; } @@ -600,7 +720,7 @@ table { tr:nth-child(even) { --tw-bg-opacity: 1; - background-color: rgb(243 244 246 / var(--tw-bg-opacity)); + background-color: rgb(243 244 246 / var(--tw-bg-opacity, 1)); } th, td { @@ -617,120 +737,20 @@ th, td { .tag { border-radius: 0.5rem; --tw-bg-opacity: 1; - background-color: rgb(30 64 175 / var(--tw-bg-opacity)); + background-color: rgb(30 64 175 / var(--tw-bg-opacity, 1)); padding: 0.25rem; font-size: 0.875rem; line-height: 1.25rem; font-weight: 600; --tw-text-opacity: 1; - color: rgb(255 255 255 / var(--tw-text-opacity)); + color: rgb(255 255 255 / var(--tw-text-opacity, 1)); } .description { font-size: 0.875rem; line-height: 1.25rem; --tw-text-opacity: 1; - color: rgb(75 85 99 / var(--tw-text-opacity)); -} - -*, ::before, ::after { - --tw-border-spacing-x: 0; - --tw-border-spacing-y: 0; - --tw-translate-x: 0; - --tw-translate-y: 0; - --tw-rotate: 0; - --tw-skew-x: 0; - --tw-skew-y: 0; - --tw-scale-x: 1; - --tw-scale-y: 1; - --tw-pan-x: ; - --tw-pan-y: ; - --tw-pinch-zoom: ; - --tw-scroll-snap-strictness: proximity; - --tw-gradient-from-position: ; - --tw-gradient-via-position: ; - --tw-gradient-to-position: ; - --tw-ordinal: ; - --tw-slashed-zero: ; - --tw-numeric-figure: ; - --tw-numeric-spacing: ; - --tw-numeric-fraction: ; - --tw-ring-inset: ; - --tw-ring-offset-width: 0px; - --tw-ring-offset-color: #fff; - --tw-ring-color: rgb(59 130 246 / 0.5); - --tw-ring-offset-shadow: 0 0 #0000; - --tw-ring-shadow: 0 0 #0000; - --tw-shadow: 0 0 #0000; - --tw-shadow-colored: 0 0 #0000; - --tw-blur: ; - --tw-brightness: ; - --tw-contrast: ; - --tw-grayscale: ; - --tw-hue-rotate: ; - --tw-invert: ; - --tw-saturate: ; - --tw-sepia: ; - --tw-drop-shadow: ; - --tw-backdrop-blur: ; - --tw-backdrop-brightness: ; - --tw-backdrop-contrast: ; - --tw-backdrop-grayscale: ; - --tw-backdrop-hue-rotate: ; - --tw-backdrop-invert: ; - --tw-backdrop-opacity: ; - --tw-backdrop-saturate: ; - --tw-backdrop-sepia: ; -} - -::backdrop { - --tw-border-spacing-x: 0; - --tw-border-spacing-y: 0; - --tw-translate-x: 0; - --tw-translate-y: 0; - --tw-rotate: 0; - --tw-skew-x: 0; - --tw-skew-y: 0; - --tw-scale-x: 1; - --tw-scale-y: 1; - --tw-pan-x: ; - --tw-pan-y: ; - --tw-pinch-zoom: ; - --tw-scroll-snap-strictness: proximity; - --tw-gradient-from-position: ; - --tw-gradient-via-position: ; - --tw-gradient-to-position: ; - --tw-ordinal: ; - --tw-slashed-zero: ; - --tw-numeric-figure: ; - --tw-numeric-spacing: ; - --tw-numeric-fraction: ; - --tw-ring-inset: ; - --tw-ring-offset-width: 0px; - --tw-ring-offset-color: #fff; - --tw-ring-color: rgb(59 130 246 / 0.5); - --tw-ring-offset-shadow: 0 0 #0000; - --tw-ring-shadow: 0 0 #0000; - --tw-shadow: 0 0 #0000; - --tw-shadow-colored: 0 0 #0000; - --tw-blur: ; - --tw-brightness: ; - --tw-contrast: ; - --tw-grayscale: ; - --tw-hue-rotate: ; - --tw-invert: ; - --tw-saturate: ; - --tw-sepia: ; - --tw-drop-shadow: ; - --tw-backdrop-blur: ; - --tw-backdrop-brightness: ; - --tw-backdrop-contrast: ; - --tw-backdrop-grayscale: ; - --tw-backdrop-hue-rotate: ; - --tw-backdrop-invert: ; - --tw-backdrop-opacity: ; - --tw-backdrop-saturate: ; - --tw-backdrop-sepia: ; + color: rgb(75 85 99 / var(--tw-text-opacity, 1)); } .container { @@ -1117,132 +1137,132 @@ th, td { .border-black { --tw-border-opacity: 1; - border-color: rgb(0 0 0 / var(--tw-border-opacity)); + border-color: rgb(0 0 0 / var(--tw-border-opacity, 1)); } .border-gray-200 { --tw-border-opacity: 1; - border-color: rgb(229 231 235 / var(--tw-border-opacity)); + border-color: rgb(229 231 235 / var(--tw-border-opacity, 1)); } .border-green-400 { --tw-border-opacity: 1; - border-color: rgb(74 222 128 / var(--tw-border-opacity)); + border-color: rgb(74 222 128 / var(--tw-border-opacity, 1)); } .border-orange-400 { --tw-border-opacity: 1; - border-color: rgb(251 146 60 / var(--tw-border-opacity)); + border-color: rgb(251 146 60 / var(--tw-border-opacity, 1)); } .border-red-400 { --tw-border-opacity: 1; - border-color: rgb(248 113 113 / var(--tw-border-opacity)); + border-color: rgb(248 113 113 / var(--tw-border-opacity, 1)); } .border-slate-900 { --tw-border-opacity: 1; - border-color: rgb(15 23 42 / var(--tw-border-opacity)); + border-color: rgb(15 23 42 / var(--tw-border-opacity, 1)); } .bg-black { --tw-bg-opacity: 1; - background-color: rgb(0 0 0 / var(--tw-bg-opacity)); + background-color: rgb(0 0 0 / var(--tw-bg-opacity, 1)); } .bg-blue-200 { --tw-bg-opacity: 1; - background-color: rgb(191 219 254 / var(--tw-bg-opacity)); + background-color: rgb(191 219 254 / var(--tw-bg-opacity, 1)); } .bg-blue-300 { --tw-bg-opacity: 1; - background-color: rgb(147 197 253 / var(--tw-bg-opacity)); + background-color: rgb(147 197 253 / var(--tw-bg-opacity, 1)); } .bg-blue-800 { --tw-bg-opacity: 1; - background-color: rgb(30 64 175 / var(--tw-bg-opacity)); + background-color: rgb(30 64 175 / var(--tw-bg-opacity, 1)); } .bg-cyan-200 { --tw-bg-opacity: 1; - background-color: rgb(165 243 252 / var(--tw-bg-opacity)); + background-color: rgb(165 243 252 / var(--tw-bg-opacity, 1)); } .bg-gray-100 { --tw-bg-opacity: 1; - background-color: rgb(243 244 246 / var(--tw-bg-opacity)); + background-color: rgb(243 244 246 / var(--tw-bg-opacity, 1)); } .bg-gray-200 { --tw-bg-opacity: 1; - background-color: rgb(229 231 235 / var(--tw-bg-opacity)); + background-color: rgb(229 231 235 / var(--tw-bg-opacity, 1)); } .bg-gray-300 { --tw-bg-opacity: 1; - background-color: rgb(209 213 219 / var(--tw-bg-opacity)); + background-color: rgb(209 213 219 / var(--tw-bg-opacity, 1)); } .bg-green-100 { --tw-bg-opacity: 1; - background-color: rgb(220 252 231 / var(--tw-bg-opacity)); + background-color: rgb(220 252 231 / var(--tw-bg-opacity, 1)); } .bg-green-200 { --tw-bg-opacity: 1; - background-color: rgb(187 247 208 / var(--tw-bg-opacity)); + background-color: rgb(187 247 208 / var(--tw-bg-opacity, 1)); } .bg-green-300 { --tw-bg-opacity: 1; - background-color: rgb(134 239 172 / var(--tw-bg-opacity)); + background-color: rgb(134 239 172 / var(--tw-bg-opacity, 1)); } .bg-orange-100 { --tw-bg-opacity: 1; - background-color: rgb(255 237 213 / var(--tw-bg-opacity)); + background-color: rgb(255 237 213 / var(--tw-bg-opacity, 1)); } .bg-orange-200 { --tw-bg-opacity: 1; - background-color: rgb(254 215 170 / var(--tw-bg-opacity)); + background-color: rgb(254 215 170 / var(--tw-bg-opacity, 1)); } .bg-purple-100 { --tw-bg-opacity: 1; - background-color: rgb(243 232 255 / var(--tw-bg-opacity)); + background-color: rgb(243 232 255 / var(--tw-bg-opacity, 1)); } .bg-red-100 { --tw-bg-opacity: 1; - background-color: rgb(254 226 226 / var(--tw-bg-opacity)); + background-color: rgb(254 226 226 / var(--tw-bg-opacity, 1)); } .bg-violet-100 { --tw-bg-opacity: 1; - background-color: rgb(237 233 254 / var(--tw-bg-opacity)); + background-color: rgb(237 233 254 / var(--tw-bg-opacity, 1)); } .bg-violet-400 { --tw-bg-opacity: 1; - background-color: rgb(167 139 250 / var(--tw-bg-opacity)); + background-color: rgb(167 139 250 / var(--tw-bg-opacity, 1)); } .bg-white { --tw-bg-opacity: 1; - background-color: rgb(255 255 255 / var(--tw-bg-opacity)); + background-color: rgb(255 255 255 / var(--tw-bg-opacity, 1)); } .bg-yellow-200 { --tw-bg-opacity: 1; - background-color: rgb(254 240 138 / var(--tw-bg-opacity)); + background-color: rgb(254 240 138 / var(--tw-bg-opacity, 1)); } .bg-yellow-50 { --tw-bg-opacity: 1; - background-color: rgb(254 252 232 / var(--tw-bg-opacity)); + background-color: rgb(254 252 232 / var(--tw-bg-opacity, 1)); } .bg-\[size\:14px\] { @@ -1257,10 +1277,6 @@ th, td { background-repeat: no-repeat; } -.p-0 { - padding: 0px; -} - .p-0\.5 { padding: 0.125rem; } @@ -1296,11 +1312,6 @@ th, td { padding-right: 0.75rem; } -.py-0 { - padding-top: 0px; - padding-bottom: 0px; -} - .py-0\.5 { padding-top: 0.125rem; padding-bottom: 0.125rem; @@ -1346,7 +1357,7 @@ th, td { } .font-sans { - font-family: ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"; + font-family: ui-sans-serif, system-ui, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"; } .text-lg { @@ -1391,42 +1402,42 @@ th, td { .text-black { --tw-text-opacity: 1; - color: rgb(0 0 0 / var(--tw-text-opacity)); + color: rgb(0 0 0 / var(--tw-text-opacity, 1)); } .text-blue-700 { --tw-text-opacity: 1; - color: rgb(29 78 216 / var(--tw-text-opacity)); + color: rgb(29 78 216 / var(--tw-text-opacity, 1)); } .text-gray-400 { --tw-text-opacity: 1; - color: rgb(156 163 175 / var(--tw-text-opacity)); + color: rgb(156 163 175 / var(--tw-text-opacity, 1)); } .text-gray-500 { --tw-text-opacity: 1; - color: rgb(107 114 128 / var(--tw-text-opacity)); + color: rgb(107 114 128 / var(--tw-text-opacity, 1)); } .text-gray-600 { --tw-text-opacity: 1; - color: rgb(75 85 99 / var(--tw-text-opacity)); + color: rgb(75 85 99 / var(--tw-text-opacity, 1)); } .text-green-700 { --tw-text-opacity: 1; - color: rgb(21 128 61 / var(--tw-text-opacity)); + color: rgb(21 128 61 / var(--tw-text-opacity, 1)); } .text-red-700 { --tw-text-opacity: 1; - color: rgb(185 28 28 / var(--tw-text-opacity)); + color: rgb(185 28 28 / var(--tw-text-opacity, 1)); } .text-white { --tw-text-opacity: 1; - color: rgb(255 255 255 / var(--tw-text-opacity)); + color: rgb(255 255 255 / var(--tw-text-opacity, 1)); } .underline { @@ -1445,42 +1456,42 @@ th, td { .even\:bg-gray-100:nth-child(even) { --tw-bg-opacity: 1; - background-color: rgb(243 244 246 / var(--tw-bg-opacity)); + background-color: rgb(243 244 246 / var(--tw-bg-opacity, 1)); } .hover\:bg-gray-100:hover { --tw-bg-opacity: 1; - background-color: rgb(243 244 246 / var(--tw-bg-opacity)); + background-color: rgb(243 244 246 / var(--tw-bg-opacity, 1)); } .hover\:bg-gray-200:hover { --tw-bg-opacity: 1; - background-color: rgb(229 231 235 / var(--tw-bg-opacity)); + background-color: rgb(229 231 235 / var(--tw-bg-opacity, 1)); } .hover\:bg-red-500:hover { --tw-bg-opacity: 1; - background-color: rgb(239 68 68 / var(--tw-bg-opacity)); + background-color: rgb(239 68 68 / var(--tw-bg-opacity, 1)); } .hover\:bg-white:hover { --tw-bg-opacity: 1; - background-color: rgb(255 255 255 / var(--tw-bg-opacity)); + background-color: rgb(255 255 255 / var(--tw-bg-opacity, 1)); } .hover\:text-blue-800:hover { --tw-text-opacity: 1; - color: rgb(30 64 175 / var(--tw-text-opacity)); + color: rgb(30 64 175 / var(--tw-text-opacity, 1)); } .hover\:text-white:hover { --tw-text-opacity: 1; - color: rgb(255 255 255 / var(--tw-text-opacity)); + color: rgb(255 255 255 / var(--tw-text-opacity, 1)); } .focus\:bg-gray-200:focus { --tw-bg-opacity: 1; - background-color: rgb(229 231 235 / var(--tw-bg-opacity)); + background-color: rgb(229 231 235 / var(--tw-bg-opacity, 1)); } .disabled\:opacity-75:disabled { @@ -1493,7 +1504,7 @@ th, td { .group:hover .group-hover\:bg-gray-400 { --tw-bg-opacity: 1; - background-color: rgb(156 163 175 / var(--tw-bg-opacity)); + background-color: rgb(156 163 175 / var(--tw-bg-opacity, 1)); } .peer:checked ~ .peer-checked\:block { @@ -1510,7 +1521,7 @@ th, td { .peer:checked ~ .peer-checked\:bg-blue-800 { --tw-bg-opacity: 1; - background-color: rgb(30 64 175 / var(--tw-bg-opacity)); + background-color: rgb(30 64 175 / var(--tw-bg-opacity, 1)); } @media (min-width: 768px) { diff --git a/internal/http/html/static/templates/content/workspace_edit.tmpl b/internal/http/html/static/templates/content/workspace_edit.tmpl index 3a23a405b..154df90ee 100644 --- a/internal/http/html/static/templates/content/workspace_edit.tmpl +++ b/internal/http/html/static/templates/content/workspace_edit.tmpl @@ -162,6 +162,11 @@ The branch from which to import new versions. This defaults to the value your version control provides as the default branch for this repository. +
+ + + Trigger a plan whenever a pull request is opened and commits are pushed to the pull request. Note: this only triggers a "plan-only" run without an apply. +
{{ end }} diff --git a/internal/run/spawner.go b/internal/run/spawner.go index 0fdc35071..8275c78f9 100644 --- a/internal/run/spawner.go +++ b/internal/run/spawner.go @@ -85,7 +85,7 @@ func (s *Spawner) handleWithError(logger logr.Logger, event vcs.Event) error { } // filter out workspaces based on info contained in the event - n := 0 + var n int for _, ws := range workspaces { switch event.Type { case vcs.EventTypeTag: @@ -115,6 +115,12 @@ func (s *Spawner) handleWithError(logger logr.Logger, event vcs.Event) error { // skip workspaces which specify a tags regex continue } + case vcs.EventTypePull: + if !ws.SpeculativeEnabled { + // skip workspaces configured to not trigger speculative plans + // (plan-only runs) in response to pull request events. + continue + } } // only tag and push events contain a list of changed files @@ -152,7 +158,7 @@ func (s *Spawner) handleWithError(logger logr.Logger, event vcs.Event) error { } // pull request events don't contain a list of changed files; instead an API - // call is necsssary to retrieve the list of changed files + // call is necessary to retrieve the list of changed files if event.Type == vcs.EventTypePull { // only perform API call if at least one workspace has file triggers // enabled. diff --git a/internal/run/spawner_test.go b/internal/run/spawner_test.go index a243a2200..585a2d9ce 100644 --- a/internal/run/spawner_test.go +++ b/internal/run/spawner_test.go @@ -76,7 +76,10 @@ func TestSpawner(t *testing.T) { }, { name: "spawn run for opened pull request", - ws: &workspace.Workspace{Connection: &workspace.Connection{}}, + ws: &workspace.Workspace{ + Connection: &workspace.Connection{}, + SpeculativeEnabled: true, + }, event: vcs.Event{ EventPayload: vcs.EventPayload{ Type: vcs.EventTypePull, Action: vcs.ActionCreated, @@ -86,7 +89,10 @@ func TestSpawner(t *testing.T) { }, { name: "spawn run for update to pull request", - ws: &workspace.Workspace{Connection: &workspace.Connection{}}, + ws: &workspace.Workspace{ + Connection: &workspace.Connection{}, + SpeculativeEnabled: true, + }, event: vcs.Event{ EventPayload: vcs.EventPayload{ Type: vcs.EventTypePull, @@ -95,6 +101,20 @@ func TestSpawner(t *testing.T) { }, spawn: true, }, + { + name: "skip run for pull event for a workspace with speculative plans disabled", + ws: &workspace.Workspace{ + Connection: &workspace.Connection{}, + SpeculativeEnabled: false, + }, + event: vcs.Event{ + EventPayload: vcs.EventPayload{ + Type: vcs.EventTypePull, + Action: vcs.ActionCreated, + }, + }, + spawn: false, + }, { name: "skip run for push event for workspace with tags regex", ws: &workspace.Workspace{Connection: &workspace.Connection{TagsRegex: "0.1.2"}}, @@ -164,8 +184,9 @@ func TestSpawner(t *testing.T) { { name: "spawn run for pull event for workspace with matching file trigger pattern", ws: &workspace.Workspace{ - TriggerPatterns: []string{"/foo/*.tf"}, - Connection: &workspace.Connection{}, + TriggerPatterns: []string{"/foo/*.tf"}, + Connection: &workspace.Connection{}, + SpeculativeEnabled: true, }, event: vcs.Event{ EventPayload: vcs.EventPayload{