Merge branch 'main' into gbouv/executable-not-found-errors

windmill-labs · Oct 9, 2023 · 675c4d3 · 675c4d3
2 parents be3f1a5 + 112844f
commit 675c4d3
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 29 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/backend/Cargo.lock b/backend/Cargo.lock
diff --git a/backend/windmill-api-client/Cargo.toml b/backend/windmill-api-client/Cargo.toml
@@ -19,11 +19,11 @@ uuid.workspace = true
 serde_json.workspace = true
 rand.workspace = true
 base64.workspace = true
-openapiv3 = "=1.0.3"
+openapiv3 = "=1.0.2"
 
 [build-dependencies]
 prettyplease = "0.2.15"
 progenitor = { git = "https://github.com/oxidecomputer/progenitor", rev = "3d96016ae8d422e90513b2d34fb5b63eeab30b01" }
 serde_json = "1.0"
 syn = "1.0"
-openapiv3 = "=1.0.3"
+openapiv3 = "=1.0.2"