Skip to content

rebase main onto release #275

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Apr 9, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/validate-examples.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ jobs:
CHECKOUT_REF: ${{ github.ref }}
outputs:
DAPR_INSTALL_URL: ${{ env.DAPR_INSTALL_URL }}
DAPR_CLI_VERSION: 1.15.0-rc.4
DAPR_RUNTIME_VERSION: 1.15.0-rc.9
DAPR_CLI_VERSION: ${{ steps.outputs.outputs.DAPR_CLI_VERSION }}
DAPR_RUNTIME_VERSION: ${{ steps.outputs.outputs.DAPR_RUNTIME_VERSION }}
CHECKOUT_REPO: ${{ steps.outputs.outputs.CHECKOUT_REPO }}
CHECKOUT_REF: ${{ steps.outputs.outputs.CHECKOUT_REF }}
GITHUB_SHA: ${{ steps.outputs.outputs.GITHUB_SHA }}
Expand Down
3 changes: 2 additions & 1 deletion dapr/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,10 @@ tokio-util = { workspace = true, features = ["io"] }


[dev-dependencies]
axum-test = "16.4.0" # TODO: Remove problematic dep
axum-test = "=16.4.0" # TODO: Remove problematic dep
litemap = "=0.7.4" # TODO: Remove pinned - linked to axum_test
zerofrom = "=0.1.5" # TODO: Remove pinned - linked to axum_test
reserve-port = "=2.1.0" # TODO: Remove pinned - linked to axum_test
once_cell = "1.19"
dapr = { path = "./" }
dapr-macros = { path = "../dapr-macros" }
Expand Down
6 changes: 3 additions & 3 deletions dapr/src/server/actor/runtime/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -102,9 +102,9 @@ impl ActorTypeRegistration {
/// # Arguments:
/// * `method_name` - The name of the method to be registered. This name will be used by actor clients to invoke the method.
/// * `handler` - The handler function to be invoked when the method is called.
/// Can be any valid [Axum handler](https://docs.rs/axum/latest/axum/handler/index.html),
/// use [Axum extractors](https://docs.rs/axum/latest/axum/extract/index.html) to access the incoming request and return an [`impl IntoResponse`](https://docs.rs/axum/latest/axum/response/trait.IntoResponse.html).
/// Use the `DaprJson` extractor to deserialize the request from Json coming from a Dapr sidecar.
/// Can be any valid [Axum handler](https://docs.rs/axum/latest/axum/handler/index.html),
/// use [Axum extractors](https://docs.rs/axum/latest/axum/extract/index.html) to access the incoming request and return an [`impl IntoResponse`](https://docs.rs/axum/latest/axum/response/trait.IntoResponse.html).
/// Use the `DaprJson` extractor to deserialize the request from Json coming from a Dapr sidecar.
/// # Example:
/// ```ignore
/// # use std::sync::Arc;
Expand Down