Merge branch 'main' into hugo/win-746-nats-triggers

windmill-labs · Jan 10, 2025 · 4c9b349 · 4c9b349
2 parents 3a608ea + cc3fabb
commit 4c9b349
Show file tree

Hide file tree

Showing 34 changed files with 840 additions and 114 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -159,7 +159,7 @@ ENV PATH="${PATH}:/usr/local/go/bin"
 ENV GO_PATH=/usr/local/go/bin/go
 
 # Install UV
-RUN curl --proto '=https' --tlsv1.2 -LsSf https://github.com/astral-sh/uv/releases/download/0.4.18/uv-installer.sh | sh && mv /root/.cargo/bin/uv /usr/local/bin/uv
+RUN curl --proto '=https' --tlsv1.2 -LsSf https://github.com/astral-sh/uv/releases/download/0.5.15/uv-installer.sh | sh && mv /root/.local/bin/uv /usr/local/bin/uv
 
 RUN curl -sL https://deb.nodesource.com/setup_20.x | bash - 
 RUN apt-get -y update && apt-get install -y curl procps nodejs awscli && apt-get clean \

diff --git a/backend/.sqlx/query-1730f39fd1793d45fbb41b21389c61296a3ff7489ae12f52a19f9543173ac597.json b/backend/.sqlx/query-1730f39fd1793d45fbb41b21389c61296a3ff7489ae12f52a19f9543173ac597.json
diff --git a/...2b18dd6da7d962118fee276af354218baac2.json → ...b357c6147e186e00e371f7374d166903ef64.json b/...2b18dd6da7d962118fee276af354218baac2.json → ...b357c6147e186e00e371f7374d166903ef64.json
diff --git a/backend/.sqlx/query-3651ed42be75d41ab0387f1551012d72c90235bb40d2f66e6fb235c990d78352.json b/backend/.sqlx/query-3651ed42be75d41ab0387f1551012d72c90235bb40d2f66e6fb235c990d78352.json
diff --git a/backend/.sqlx/query-55cb03040bc2a8c53dd7fbb42bbdcc40f463cbc52d94ed9315cf9a547d4c89f2.json b/backend/.sqlx/query-55cb03040bc2a8c53dd7fbb42bbdcc40f463cbc52d94ed9315cf9a547d4c89f2.json
diff --git a/backend/.sqlx/query-6c845f168b6265e6cf92e4d33c5409edfdc1847d0348df2ea55504ddaaa67736.json b/backend/.sqlx/query-6c845f168b6265e6cf92e4d33c5409edfdc1847d0348df2ea55504ddaaa67736.json
diff --git a/...e15a0816a6b4fd036cf7b991a210654b2633.json → ...3d393ed0bb73314e5c430f32541c43bcac52.json b/...e15a0816a6b4fd036cf7b991a210654b2633.json → ...3d393ed0bb73314e5c430f32541c43bcac52.json
diff --git a/backend/.sqlx/query-d2668c2d4ece82a3617f098fe993d3e218fa224bd0bb311e7db776c7fd69cf0b.json b/backend/.sqlx/query-d2668c2d4ece82a3617f098fe993d3e218fa224bd0bb311e7db776c7fd69cf0b.json
diff --git a/backend/.sqlx/query-e54eb583f011cea6e4d533f4d2014cbf509b5afcc2647048c9bfc839d8f290ad.json b/backend/.sqlx/query-e54eb583f011cea6e4d533f4d2014cbf509b5afcc2647048c9bfc839d8f290ad.json
diff --git a/backend/.sqlx/query-eed16e356f3f36183c3db13fcc1950295e0d0fbdabb38434534fb3430eeddc25.json b/backend/.sqlx/query-eed16e356f3f36183c3db13fcc1950295e0d0fbdabb38434534fb3430eeddc25.json
diff --git a/backend/migrations/20250107212922_workspace_color.down.sql b/backend/migrations/20250107212922_workspace_color.down.sql
@@ -0,0 +1 @@
+ALTER TABLE workspace_settings DROP COLUMN color;
diff --git a/backend/migrations/20250107212922_workspace_color.up.sql b/backend/migrations/20250107212922_workspace_color.up.sql
@@ -0,0 +1 @@
+ALTER TABLE workspace_settings ADD COLUMN color VARCHAR(7) DEFAULT NULL;
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		ALTER TABLE workspace_settings DROP COLUMN color;
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		ALTER TABLE workspace_settings ADD COLUMN color VARCHAR(7) DEFAULT NULL;