From 29b475ee73072654e9a466fdf4216f2770fc8a30 Mon Sep 17 00:00:00 2001 From: lucasliang Date: Tue, 5 Nov 2024 19:39:19 +0800 Subject: [PATCH 1/2] CI: update CI workflows. This pr is used to update the current CI workflow, the relative nightly tests on `ubuntu-latest` env is extracted and deployed on self-defined workflow, maintanined by TiKV-teams. Signed-off-by: lucasliang --- .github/workflows/rust.yml | 12 +++--------- Cargo.toml | 6 ++++-- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 1ca6f12f..0db43f71 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -10,7 +10,9 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ ubuntu-latest, macos-latest ] + # tests with sanitizer on `ubuntu-latest` is supported by + # self-defined `nihtly test` job, so we don't need to test it here. + os: [ macos-latest ] steps: - uses: actions/checkout@v2 with: @@ -41,14 +43,6 @@ jobs: env: RUST_BACKTRACE: 1 EXTRA_CARGO_ARGS: '--verbose' - - name: Run asan tests - if: ${{ matrix.os == 'ubuntu-latest' }} - run: make test - env: - RUST_BACKTRACE: 1 - RUSTFLAGS: '-Zsanitizer=address' - RUSTDOCFLAGS: '-Zsanitizer=address' - EXTRA_CARGO_ARGS: '--verbose -Zbuild-std --target x86_64-unknown-linux-gnu' stable: runs-on: ${{ matrix.os }} strategy: diff --git a/Cargo.toml b/Cargo.toml index aa6669ed..3ae1e1a6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -46,7 +46,7 @@ log = { version = "0.4", features = [ "max_level_trace", "release_max_level_debug", ] } -lz4-sys = "1.9" +llz4-sys = { version = "=1.9.5" } memmap2 = { version = "0.9", optional = true } nix = "0.26" num-derive = "0.4" @@ -58,7 +58,7 @@ protobuf = "2" rayon = "1.5" rhai = { version = "1.7", features = ["sync"], optional = true } scopeguard = "1.1" -serde = { version = "1.0", features = ["derive"] } +serde = { version = "=1.0.194", features = ["derive"] } serde_repr = "0.1" strum = { version = "0.25.0", features = ["derive"] } thiserror = "1.0" @@ -93,6 +93,8 @@ nightly_group = ["nightly", "swap"] raft-proto = { git = "https://github.com/tikv/raft-rs", branch = "master" } protobuf = { git = "https://github.com/pingcap/rust-protobuf", branch = "v2.8" } protobuf-codegen = { git = "https://github.com/pingcap/rust-protobuf", branch = "v2.8" } +# Lock the version of cc-rs to avoid build failure on MacOS, ref https://github.com/rust-lang/cc-rs/issues/984. +cc = { git = "https://github.com/rust-lang/cc-rs", tag = "1.0.98" } [workspace] members = ["stress", "ctl"] From 0d948af9105818f67704cf0fcd4a90f7a539316d Mon Sep 17 00:00:00 2001 From: lucasliang Date: Tue, 5 Nov 2024 19:44:56 +0800 Subject: [PATCH 2/2] Fix errs. Signed-off-by: lucasliang --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 3ae1e1a6..1b482af4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -46,7 +46,7 @@ log = { version = "0.4", features = [ "max_level_trace", "release_max_level_debug", ] } -llz4-sys = { version = "=1.9.5" } +lz4-sys = { version = "=1.9.5" } memmap2 = { version = "0.9", optional = true } nix = "0.26" num-derive = "0.4"