Merge branch 'master' into feat/support_lock_api

dapr · Sep 20, 2023 · 91472c9 · 91472c9
2 parents 255078e + b442ba4
commit 91472c9
Show file tree

Hide file tree

Showing 7 changed files with 804 additions and 393 deletions.
diff --git a/.github/holopin.yml b/.github/holopin.yml
@@ -0,0 +1,6 @@
+organization: dapr
+defaultSticker: clmjkxscc122740fl0mkmb7egi
+stickers:
+  -
+    id: clmjkxscc122740fl0mkmb7egi
+    alias: ghc2023
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -43,9 +43,9 @@ jobs:
       GOARCH: amd64
       GOPROXY: https://proxy.golang.org
       JDK_VER: ${{ matrix.java }}
-      DAPR_CLI_VER: 1.11.0-rc.1
-      DAPR_RUNTIME_VER: 1.11.0-rc.5
-      DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v1.11.0-rc.1/install/install.sh
+      DAPR_CLI_VER: 1.11.0
+      DAPR_RUNTIME_VER: 1.11.3
+      DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v1.11.0/install/install.sh
       DAPR_CLI_REF:
       DAPR_REF:
       TOXIPROXY_URL: https://github.com/Shopify/toxiproxy/releases/download/v2.5.0/toxiproxy-server-linux-amd64

diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
@@ -37,9 +37,9 @@ jobs:
       GOARCH: amd64
       GOPROXY: https://proxy.golang.org
       JDK_VER: ${{ matrix.java }}
-      DAPR_CLI_VER: 1.11.0-rc.1
-      DAPR_RUNTIME_VER: 1.11.0-rc.5
-      DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v1.11.0-rc.1/install/install.sh
+      DAPR_CLI_VER: 1.11.0
+      DAPR_RUNTIME_VER: 1.11.3
+      DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v1.11.0/install/install.sh
       DAPR_CLI_REF:
       DAPR_REF:
     steps: