Merge branch 'main' into release-1.16

Signed-off-by: Albert Callarisa <[email protected]>

Author: acroca

.github/workflows/build-push-to-main.yaml

@@ -10,9 +10,9 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - name: Set up Python 3.9
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v6
       with:
         python-version: 3.9
     - name: Install dependencies
@@ -42,9 +42,9 @@ jobs:
       matrix:
         python_ver: ["3.9", "3.10", "3.11", "3.12", "3.13"]
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - name: Set up Python ${{ matrix.python_ver }}
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v6
       with:
         python-version: ${{ matrix.python_ver }}
     - name: Install dependencies
@@ -66,9 +66,9 @@ jobs:
     env:
       TWINE_USERNAME: "__token__"
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - name: Set up Python 3.9
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v6
       with:
         python-version: 3.9
     - name: Install dependencies

.github/workflows/build-tag.yaml

@@ -14,9 +14,9 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - name: Set up Python 3.9
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v6
       with:
         python-version: 3.9
     - name: Install dependencies
@@ -46,9 +46,9 @@ jobs:
       matrix:
         python_ver: ["3.9", "3.10", "3.11", "3.12", "3.13"]
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - name: Set up Python ${{ matrix.python_ver }}
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v6
       with:
         python-version: ${{ matrix.python_ver }}
     - name: Install dependencies
@@ -70,9 +70,9 @@ jobs:
     env:
       TWINE_USERNAME: "__token__"
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - name: Set up Python 3.9
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v6
       with:
         python-version: 3.9
     - name: Install dependencies

.github/workflows/build.yaml

@@ -16,9 +16,9 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - name: Set up Python 3.9
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v6
       with:
         python-version: 3.9
     - name: Install dependencies
@@ -48,9 +48,9 @@ jobs:
       matrix:
         python_ver: ["3.9", "3.10", "3.11", "3.12", "3.13"]
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - name: Set up Python ${{ matrix.python_ver }}
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v6
       with:
         python-version: ${{ matrix.python_ver }}
     - name: Install dependencies

.github/workflows/dapr-bot-schedule.yml

@@ -24,7 +24,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - name: Install dependencies
         run: pip install PyGithub
       - name: Automerge and update

.github/workflows/fossa.yaml

@@ -40,7 +40,7 @@ jobs:
       FOSSA_API_KEY: b88e1f4287c3108c8751bf106fb46db6 # This is a push-only token that is safe to be exposed.
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: "Run FOSSA Scan"
         uses: fossas/[email protected] # Use a specific version if locking is preferred

.github/workflows/validate_examples.yaml

@@ -58,7 +58,7 @@ jobs:
           fi
 
       - name: Check out code onto GOPATH
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           repository: ${{ env.CHECKOUT_REPO }}
           ref: ${{ env.CHECKOUT_REF }}
@@ -74,7 +74,7 @@ jobs:
           echo "DAPR_CLI_VER=$CLI_VERSION" >> $GITHUB_ENV
           echo "Found $CLI_VERSION"
       - name: Set up Python ${{ matrix.python_ver }}
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: ${{ matrix.python_ver }}
       - name: Install dependencies
@@ -89,14 +89,14 @@ jobs:
         with:
           go-version: ${{ env.GOVER }}
       - name: Checkout Dapr CLI repo to override dapr command.
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         if: env.DAPR_CLI_REF != ''
         with:
           repository: dapr/cli
           ref: ${{ env.DAPR_CLI_REF }}
           path: cli
       - name: Checkout Dapr repo to override daprd.
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         if: env.DAPR_REF != ''
         with:
           repository: dapr/dapr

README.md

@@ -149,6 +149,7 @@ The generated files will be found in `docs/_build`.
 
 ```sh
 pip3 install -r tools/requirements.txt
+export DAPR_BRANCH=release-1.16 # Optional, defaults to master
 ./tools/regen_grpcclient.sh
 ```
 

dapr/proto/README.md

@@ -13,6 +13,7 @@ Run the following commands:
 
 ```sh
 pip3 install -r tools/requirements.txt
+export DAPR_BRANCH=release-1.16 # Optional, defaults to master
 ./tools/regen_grpcclient.sh
 ```
 

examples/crypto/README.md

@@ -21,7 +21,7 @@ It creates a client using `DaprClient`, uses a local store defined in
 
 <!-- STEP
 name: Generate crypto
-timeout_seconds: 5
+timeout_seconds: 20
 -->
 
 ```bash

tools/regen_grpcclient.sh

@@ -16,6 +16,7 @@
 # Path to store output
 PROTO_PATH="dapr/proto"
 SRC=.
+DAPR_BRANCH=${DAPR_BRANCH:-master}
 
 # Http request CLI
 HTTP_REQUEST_CLI=curl
@@ -38,7 +39,7 @@ downloadFile() {
     FILE_PATH="${PROTO_PATH}/${PKG_NAME}/v1"
 
     # URL for proto file
-    PROTO_URL="https://raw.githubusercontent.com/dapr/dapr/master/dapr/proto/${PKG_NAME}/v1/${FILE_NAME}.proto"
+    PROTO_URL="https://raw.githubusercontent.com/dapr/dapr/${DAPR_BRANCH}/dapr/proto/${PKG_NAME}/v1/${FILE_NAME}.proto"
 
     mkdir -p "${FILE_PATH}"