Merge branch 'release-0.16' into http-server-error-handling

Author: mikeee

.github/workflows/ci.yml

@@ -22,7 +22,7 @@ env:
 
 jobs:
   lint:
-    name: Lint
+    name: Check and Lint
     runs-on: ubuntu-latest
 
     steps:
@@ -37,14 +37,20 @@ jobs:
         repo-token: ${{ secrets.GITHUB_TOKEN }}
         version: ${{ env.PROTOC_VERSION }}
     - uses: actions/checkout@v4
+
+    - name: Check compiled protos for a diff
+      run: |
+        make proto-gen check-diff-proto
+
     - name: cargo fmt
       run: cargo fmt -- --check --color ${{ env.CARGO_TERM_COLOR }}
+
     - name: cargo clippy
       run: cargo clippy
 
 
   build:
-    name: Build on rust-${{ matrix.rust-version}}
+    name: Test and Build on rust-${{ matrix.rust-version }}
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
@@ -71,33 +77,60 @@ jobs:
     - name: Run Tests
       run: cargo test --workspace --all-targets --all-features
 
-  test-docs-sdk:
-    name: Docs SDK
+  test-docs:
+    name: Check Docs - ${{ matrix.crate }}
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        crate:
+          - dapr
+          - dapr-macros
     env:
       RUSTDOCFLAGS: -Dwarnings
     steps:
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@nightly
       - uses: dtolnay/install@cargo-docs-rs
-      - run: cargo docs-rs -p dapr
+      - run: cargo docs-rs -p ${{ matrix.crate }}
 
-  test-docs-macros:
-    name: Docs Macros
+  publish-dry:
+    name: Publish Test
     runs-on: ubuntu-latest
-    env:
-      RUSTDOCFLAGS: -Dwarnings
+    strategy:
+      fail-fast: false
+      matrix:
+        crate:
+          - dapr
+          - dapr-macros
+
     steps:
+      - name: Install Rust
+        uses: dtolnay/rust-toolchain@master
+        with:
+          toolchain: stable
+          components: clippy, rustfmt
+      - name: Install Protoc
+        uses: arduino/setup-protoc@v3
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          version: ${{ env.PROTOC_VERSION }}
       - uses: actions/checkout@v4
-      - uses: dtolnay/rust-toolchain@nightly
-      - uses: dtolnay/install@cargo-docs-rs
-      - run: cargo docs-rs -p dapr-macros
+      - name: cargo publish - ${{ matrix.crate }}
+        run: cargo publish --manifest-path ${{ matrix.crate }}/Cargo.toml --dry-run
+
 
   publish:
     name: Publish
     runs-on: ubuntu-latest
-    needs: [test-docs-sdk, test-docs-macros, lint, build]
+    needs: [test-docs, lint, build, publish-dry]
     if: startswith(github.ref, 'refs/tags/v')
+    strategy:
+      fail-fast: false
+      matrix:
+        crate:
+          - dapr
+          - dapr-macros
 
     steps:
     - name: Install Rust
@@ -111,7 +144,5 @@ jobs:
         repo-token: ${{ secrets.GITHUB_TOKEN }}
         version: ${{ env.PROTOC_VERSION }}
     - uses: actions/checkout@v4
-    - name: cargo publish dapr-macros
-      run: cargo publish --manifest-path dapr-macros/Cargo.toml --token ${{ env.CARGO_TOKEN }}
-    - name: cargo publish dapr
-      run: cargo publish --manifest-path dapr/Cargo.toml --token ${{ env.CARGO_TOKEN }}
+    - name: cargo publish - ${{ matrix.crate }}
+      run: cargo publish --manifest-path ${{ matrix.crate }}/Cargo.toml --token ${{ env.CARGO_TOKEN }}

.github/workflows/validate-examples.yml

@@ -46,7 +46,7 @@ jobs:
       DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/master/install/install.sh
       DAPR_CLI_REF: ${{ github.event.inputs_daprcli_commit }}
       DAPR_CLI_VERSION: ${{ github.event.inputs_daprcli_version }}
-      DAPR_REF: ${{ github.event.inputs.dapr_commit }}
+      DAPR_REF: 334ae9eea43d487a7b29a0e4aef904e3eba57a10
       DAPR_RUNTIME_VERSION: ${{ github.event.inputs.dapr_version }}
       CHECKOUT_REPO: ${{ github.repository }}
       CHECKOUT_REF: ${{ github.ref }}
@@ -76,14 +76,14 @@ jobs:
       - name: Determine latest Dapr Runtime version
         if: env.DAPR_RUNTIME_VERSION == ''
         run: |
-          RUNTIME_VERSION=$(curl -s "https://api.github.com/repos/dapr/dapr/releases/latest" | grep '"tag_name"' | cut -d ':' -f2 | tr -d '",v')
+          RUNTIME_VERSION=$(curl -s "https://api.github.com/repos/dapr/dapr/releases/latest" | grep '"tag_name"' | cut -d ':' -f2 | tr -d ' ",v')
           echo "DAPR_RUNTIME_VERSION=$RUNTIME_VERSION" >> $GITHUB_ENV
           echo "Found $RUNTIME_VERSION"
 
       - name: Determine latest Dapr Cli version
         if: env.DAPR_CLI_VERSION == ''
         run: |
-          CLI_VERSION=$(curl -s "https://api.github.com/repos/dapr/cli/releases/latest" | grep '"tag_name"' | cut -d ':' -f2 | tr -d '",v')
+          CLI_VERSION=$(curl -s "https://api.github.com/repos/dapr/cli/releases/latest" | grep '"tag_name"' | cut -d ':' -f2 | tr -d ' ",v')
           echo "DAPR_CLI_VERSION=$CLI_VERSION" >> $GITHUB_ENV
           echo "Found $CLI_VERSION"
 
@@ -127,6 +127,7 @@ jobs:
           cd dapr_runtime
           make
           echo "artifactPath=~/artifacts/$GITHUB_SHA/" >> $GITHUB_ENV
+          mkdir -p $HOME/artifacts/$GITHUB_SHA/
           RUNTIME_VERSION=edge
           echo "DAPR_RUNTIME_VERSION=$RUNTIME_VERSION" >> $GITHUB_ENV
 
@@ -135,7 +136,7 @@ jobs:
         run: |
           mkdir ~/dapr_docker
           cd dapr_runtime
-          docker build --build-arg "PKG_FILES=*" -f ./docker/Dockerfile ./dist/linux_amd64/release -t daprio/dapr:0.0.0-dev
+          docker build --build-arg "PKG_FILES=*" -f ./docker/Dockerfile ./dist/linux_amd64/release -t daprio/dapr:9.0.0-dev
 
       - name: Download Install Bundle CLI
         if: env.DAPR_REF != '' && env.DAPR_CLI_REF == ''
@@ -147,14 +148,14 @@ jobs:
           ls -la
 
       - name: Build Custom Install Bundle
-        if: env.DAPR_REF != '' && env.DAPR_CLI_REF != ''
+        if: env.DAPR_REF != '' || env.DAPR_CLI_REF != ''
         run: |
           : # Create daprbundle directory
           mkdir ~/daprbundle
           cp .github/workflows/validate-examples/details.json ~/daprbundle/
 
           : # Add cli
-          cp ~/artifacts/$GITHUB_SHA/dapr ~/daprbundle/dapr
+          cp cli/dist/linux_amd64/release/dapr ~/daprbundle/dapr
 
           : # Compress executables to /dist/ appending _linux_amd64 to the name
           mkdir ~/daprbundle/dist
@@ -169,7 +170,7 @@ jobs:
 
           : # Add docker image
           mkdir ~/daprbundle/docker
-          docker save daprio/dapr:0.0.0-dev | gzip > ~/daprbundle/docker/daprio-dapr-0.0.0-dev.tar.gz
+          docker save daprio/dapr:9.0.0-dev | gzip > ~/daprbundle/docker/daprio-dapr-9.0.0-dev.tar.gz
 
           : # Bundle
           cd ~/daprbundle
@@ -219,7 +220,7 @@ jobs:
       fail-fast: false
       matrix:
         examples:
-          [ "actors", "bindings", "client", "configuration", "crypto", "invoke/grpc", "invoke/grpc-proxying", "jobs", "pubsub", "query_state", "secrets-bulk" ]
+          [ "actors", "bindings", "client", "configuration", "conversation", "crypto", "invoke/grpc", "invoke/grpc-proxying", "jobs", "pubsub", "query_state", "secrets-bulk" ]
     steps:
       - name: Check out code
         uses: actions/checkout@v4

.github/workflows/validate-examples/details.json

@@ -1,9 +1,9 @@
 {
-    "daprd": "0.0.0-dev",
-    "dashboard": "0.0.0-dev",
-    "cli": "0.0.0-dev",
+    "daprd": "9.0.0-dev",
+    "dashboard": "9.0.0-dev",
+    "cli": "9.0.0-dev",
     "daprBinarySubDir": "dist",
     "dockerImageSubDir": "docker",
-    "daprImageName": "daprio/dapr:0.0.0-dev",
-    "daprImageFileName": "daprio-dapr-0.0.0-dev.tar.gz"
+    "daprImageName": "daprio/dapr:9.0.0-dev",
+    "daprImageFileName": "daprio-dapr-9.0.0-dev.tar.gz"
   }

Cargo.toml

@@ -12,9 +12,6 @@ resolver = "2"
 
 [workspace.dependencies]
 async-trait = "0.1"
-
-dapr-macros = { version = "0.16.0-rc.2", path = "./dapr-macros" }
-
 prost = "0.13.1"
 prost-build = "0.13.1"
 prost-types = "0.13.1"
@@ -31,7 +28,7 @@ tonic = "0.12.1"
 tonic-build = "0.12.1"
 
 [workspace.package]
-version = "0.16.0-rc.2"
+version = "0.16.0-rc.3"
 authors = [
     "Mike Nguyen <[email protected]>",
     "The Dapr Authors <[email protected]>"

Makefile

@@ -0,0 +1,7 @@
+.PHONY: proto-gen
+proto-gen:
+	cargo run --bin proto-gen
+
+.PHONY: check-diff-proto
+check-diff-proto:
+	git diff --exit-code ./proto/

README.md

@@ -53,7 +53,7 @@ Add the following to your `Cargo.toml` file:
 
 ```toml
 [dependencies]
-dapr = "0.16.0-rc.2"
+dapr = "0.16.0-rc.3"
 ```
 
 Here's a basic example to create a client:

dapr/Cargo.toml

@@ -15,7 +15,6 @@ async-trait = { workspace = true }
 axum = "0.7"
 bytes = "1.7"
 chrono = "0.4"
-dapr-macros = { workspace = true }
 futures = "0.3"
 log = "0.4"
 prost = { workspace = true }
@@ -28,9 +27,10 @@ tokio-util = { workspace = true, features = ["io"] }
 
 
 [dev-dependencies]
-axum-test = "15.3"
+axum-test = "16.4.0"
 once_cell = "1.19"
 dapr = { path = "./" }
+dapr-macros = { path = "../dapr-macros" }
 tokio = { workspace = true, features = ["full"] }
 uuid = { version = "1.10", features = ["v4"] }
 tokio-test = { workspace = true }