Skip to content
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

build: disable hakari #16142

Merged
merged 4 commits into from
Apr 4, 2024
Merged
Show file tree
Hide file tree
Changes from 3 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
6 changes: 0 additions & 6 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,6 @@ updates:
patterns:
- "google-cloud*"
# Don't update these directories
- package-ecosystem: cargo
directory: /src/workspace-hack
schedule:
interval: "daily"
ignore:
- dependency-name: "*"
- package-ecosystem: cargo
directory: /integration_tests/feature-store
schedule:
Expand Down
34 changes: 0 additions & 34 deletions .github/workflows/hakari_fix.yml

This file was deleted.

141 changes: 1 addition & 140 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion Makefile.toml
Original file line number Diff line number Diff line change
Expand Up @@ -1180,7 +1180,8 @@ scripts/check/check-trailing-spaces.sh --fix
category = "RiseDev - Check"
dependencies = [
"warn-on-missing-tools",
"check-hakari",
# Disable hakari until we make sure it's useful
# "check-hakari",
"check-dep-sort",
"check-fmt",
"check-trailing-spaces",
Expand Down
7 changes: 4 additions & 3 deletions ci/scripts/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,10 @@ fi
echo "--- Rust cargo-sort check"
cargo sort --check --workspace --grouped

echo "--- Rust cargo-hakari check"
cargo hakari generate --diff
cargo hakari verify
# Disable hakari until we make sure it's useful
# echo "--- Rust cargo-hakari check"
# cargo hakari generate --diff
# cargo hakari verify

echo "--- Rust format check"
cargo fmt --all -- --check
Expand Down
2 changes: 1 addition & 1 deletion src/jni_core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ chrono = { version = "0.4", default-features = false }
fs-err = "2"
futures = { version = "0.3", default-features = false, features = ["alloc"] }
itertools = "0.12"
jni = "0.21.1"
jni = { version = "0.21.1", features = ["invocation"] }
paste = "1"
prost = { workspace = true }
risingwave_common = { workspace = true }
Expand Down
5 changes: 3 additions & 2 deletions src/meta/src/barrier/rpc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ use futures::future::try_join_all;
use futures::stream::{BoxStream, FuturesUnordered};
use futures::{pin_mut, FutureExt, StreamExt};
use itertools::Itertools;
use risingwave_common::bail;
use risingwave_common::hash::ActorId;
use risingwave_common::util::tracing::TracingContext;
use risingwave_pb::common::{ActorInfo, WorkerNode};
Expand Down Expand Up @@ -213,7 +212,9 @@ impl ControlStreamManager {
&mut self,
command_context: Arc<CommandContext>,
) -> MetaResult<HashSet<WorkerId>> {
fail_point!("inject_barrier_err", |_| bail!("inject_barrier_err"));
fail_point!("inject_barrier_err", |_| risingwave_common::bail!(
"inject_barrier_err"
));
let mutation = command_context.to_mutation();
let info = command_context.info.clone();
let mut node_need_collect = HashSet::new();
Expand Down
1 change: 1 addition & 0 deletions src/object_store/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ repository = { workspace = true }
async-trait = "0.1"
await-tree = { workspace = true }
aws-config = { workspace = true }
aws-credential-types = { workspace = true }
aws-sdk-s3 = { version = "0.5", package = "madsim-aws-sdk-s3" }
aws-smithy-http = { workspace = true }
aws-smithy-runtime = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion src/prost/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ prost = { workspace = true }
prost-helpers = { path = "helpers" }
risingwave_error = { workspace = true }
serde = { version = "1", features = ["derive"] }
strum = "0.26"
strum = { version = "0.26", features = ["derive"] }
thiserror = "1"
tonic = { workspace = true }

Expand Down
Loading
Loading