From 9ec3d27042505464e3813e06d94cb5b92f2bb988 Mon Sep 17 00:00:00 2001 From: iGxnon Date: Tue, 19 Dec 2023 11:27:36 +0800 Subject: [PATCH] chore: fix mergify Signed-off-by: iGxnon --- .github/workflows/pull_request.yml | 2 +- .mergify.yml | 4 +++- Cargo.lock | 2 -- workspace-hack/Cargo.toml | 2 -- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index f7cb90a5b..27544d877 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -7,7 +7,6 @@ on: jobs: test: - name: Tests runs-on: ubuntu-latest defaults: run: @@ -31,6 +30,7 @@ jobs: rustflags: "--cfg madsim", test: "nextest run --package=simulation", } + name: Tests ${{ matrix.config.name }} steps: - uses: actions/checkout@v4 with: diff --git a/.mergify.yml b/.mergify.yml index 33b9d4539..7d73e3c35 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -2,7 +2,9 @@ pull_request_rules: - name: Automatic merge on approval conditions: - "#approved-reviews-by>=2" - - check-success=Checks + - check-success=Validation + - check-success=Tests Normal + - check-success=Tests Madsim - check-success=Commit Message Validation - check-success=Spell Check - check-success=DCO diff --git a/Cargo.lock b/Cargo.lock index f4a45ac18..9f61d1b61 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3556,7 +3556,6 @@ dependencies = [ "bytes", "clap 4.4.8", "clap_builder", - "crypto-common", "digest", "either", "futures-channel", @@ -3578,7 +3577,6 @@ dependencies = [ "opentelemetry_sdk", "rand", "serde", - "sha2", "syn 2.0.39", "time", "tokio", diff --git a/workspace-hack/Cargo.toml b/workspace-hack/Cargo.toml index 488ad583b..9ab98214e 100644 --- a/workspace-hack/Cargo.toml +++ b/workspace-hack/Cargo.toml @@ -16,7 +16,6 @@ publish = false bytes = { version = "1" } clap = { version = "4", features = ["derive", "string"] } clap_builder = { version = "4", default-features = false, features = ["color", "help", "std", "string", "suggestions", "usage"] } -crypto-common = { version = "0.1", default-features = false, features = ["std"] } digest = { version = "0.10", features = ["mac", "std"] } either = { version = "1" } futures-channel = { version = "0.3", features = ["sink"] } @@ -38,7 +37,6 @@ opentelemetry-jaeger = { version = "0.17", features = ["rt-tokio"] } opentelemetry_sdk = { version = "0.18", features = ["metrics", "rt-tokio"] } rand = { version = "0.8", features = ["small_rng"] } serde = { version = "1", features = ["derive", "rc"] } -sha2 = { version = "0.10" } time = { version = "0.3", features = ["formatting", "macros", "parsing"] } tokio = { version = "1", features = ["fs", "io-std", "io-util", "macros", "net", "rt-multi-thread", "signal", "sync", "time"] } tokio-util = { version = "0.7", features = ["codec", "io"] }