Merge branch 'main' into fix-css-editor

windmill-labs · Oct 9, 2023 · 86f5c67 · 86f5c67
2 parents c9ce635 + 112844f
commit 86f5c67
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 39 deletions.
diff --git a/.github/workflows/automerge-dependabot.yml b/.github/workflows/automerge-dependabot.yml
@@ -1,26 +1,26 @@
-name: dependabot auto-merge
+# name: dependabot auto-merge
 
-on: pull_request_target
+# on: pull_request_target
 
-permissions:
-  contents: read
-  pull-requests: read
+# permissions:
+#   contents: read
+#   pull-requests: read
 
-jobs:
-  dependabot:
-    runs-on: ubuntu-latest
-    if: ${{ github.actor == 'dependabot[bot]' }}
-    steps:
-      - name: Dependabot metadata
-        id: metadata
-        uses: dependabot/fetch-metadata@v1.6.0
-        with:
-          github-token: "${{ secrets.GITHUB_TOKEN }}"
-      - name: Enable auto-merge for Dependabot PRs
-        if: steps.metadata.outputs.update-type == 'version-update:semver-patch' ||  steps.metadata.outputs.update-type == 'version-update:semver-minor'
-        run: |
-          echo ${{ secrets.RUBEN_PAT }} | gh auth login --with-token
-          gh pr review --approve "$PR_URL"
-          gh pr merge --auto --squash "$PR_URL"
-        env:
-          PR_URL: ${{github.event.pull_request.html_url}}
+# jobs:
+#   dependabot:
+#     runs-on: ubuntu-latest
+#     if: ${{ github.actor == 'dependabot[bot]' }}
+#     steps:
+#       - name: Dependabot metadata
+#         id: metadata
+#         uses: dependabot/fetch-metadata@v1.6.0
+#         with:
+#           github-token: "${{ secrets.GITHUB_TOKEN }}"
+#       - name: Enable auto-merge for Dependabot PRs
+#         if: steps.metadata.outputs.update-type == 'version-update:semver-patch' ||  steps.metadata.outputs.update-type == 'version-update:semver-minor'
+#         run: |
+#           echo ${{ secrets.RUBEN_PAT }} | gh auth login --with-token
+#           gh pr review --approve "$PR_URL"
+#           gh pr merge --auto --squash "$PR_URL"
+#         env:
+#           PR_URL: ${{github.event.pull_request.html_url}}
diff --git a/.github/workflows/sign-cla.yml b/.github/workflows/sign-cla.yml
@@ -12,7 +12,7 @@ jobs:
       - name: "CLA Assistant"
         if: (github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA') || github.event_name == 'pull_request_target'
         # Beta Release
-        uses: cla-assistant/github-action@v2.2.1
+        uses: cla-assistant/github-action@v2.3.1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           PERSONAL_ACCESS_TOKEN: ${{ secrets.CLA_PAT }}

diff --git a/backend/Cargo.lock b/backend/Cargo.lock
diff --git a/backend/windmill-api-client/Cargo.toml b/backend/windmill-api-client/Cargo.toml
@@ -22,7 +22,7 @@ base64.workspace = true
 openapiv3 = "=1.0.2"
 
 [build-dependencies]
-prettyplease = "0.1.25"
+prettyplease = "0.2.15"
 progenitor = { git = "https://github.com/oxidecomputer/progenitor", rev = "3d96016ae8d422e90513b2d34fb5b63eeab30b01" }
 serde_json = "1.0"
 syn = "1.0"

diff --git a/frontend/src/lib/components/WorkspaceGroup.svelte b/frontend/src/lib/components/WorkspaceGroup.svelte
@@ -77,7 +77,7 @@
 	}}
 >
 	<div class="flex flex-col w-full space-y-4">
-		<span>Are you sure you want to remove this worker nconfig?</span>
+		<span>Are you sure you want to remove this worker group {name}?</span>
 	</div>
 </ConfirmationModal>
 
@@ -329,7 +329,7 @@
 				color="light"
 				size="xs"
 				on:click={() => {
-					if (!enterpriseLicense) {
+					if (!$enterpriseLicense) {
 						sendUserToast('Worker Management UI is an EE feature', true)
 					} else {
 						openDelete = true