Skip to content

Commit

Permalink
[Cherry-pick] CP #370 & #372 to tikv-7.5 (#376)
Browse files Browse the repository at this point in the history
 

Signed-off-by: lucasliang <[email protected]>
  • Loading branch information
LykxSassinator authored Dec 4, 2024
1 parent 4a771db commit 8cb23f1
Show file tree
Hide file tree
Showing 8 changed files with 2,432 additions and 38 deletions.
15 changes: 6 additions & 9 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ ubuntu-latest, macos-latest ]
os: [ ubuntu-22.04, macos-14 ]
steps:
- uses: actions/checkout@v2
with:
Expand All @@ -25,9 +25,6 @@ jobs:
- uses: Swatinem/rust-cache@v1
with:
sharedKey: ${{ matrix.os }}
- name: Cache dependencies
if: ${{ matrix.os == 'ubuntu-latest' }}
run: if [[ ! -e ~/.cargo/bin/grcov ]]; then cargo install grcov; fi
- name: Format
run: |
make format
Expand All @@ -40,7 +37,7 @@ jobs:
RUST_BACKTRACE: 1
EXTRA_CARGO_ARGS: '--verbose'
- name: Run asan tests
if: ${{ matrix.os == 'ubuntu-latest' }}
if: ${{ matrix.os == 'ubuntu-22.04' }}
run: make test
env:
RUST_BACKTRACE: 1
Expand All @@ -51,7 +48,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ ubuntu-latest ]
os: [ ubuntu-22.04 ]
steps:
- uses: actions/checkout@v2
with:
Expand All @@ -77,7 +74,7 @@ jobs:
EXTRA_CARGO_ARGS: '--verbose'
WITH_STABLE_TOOLCHAIN: 'force'
coverage:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
needs: nightly
steps:
- uses: actions/checkout@v2
Expand All @@ -92,9 +89,9 @@ jobs:
components: llvm-tools-preview
- uses: Swatinem/rust-cache@v1
with:
sharedKey: ubuntu-latest
sharedKey: ubuntu-22.04
- name: Install grcov
run: if [[ ! -e ~/.cargo/bin/grcov ]]; then cargo install --locked grcov; fi
run: if [[ ! -e ~/.cargo/bin/grcov ]]; then cargo install --locked grcov --version 0.8.10; fi
- name: Run tests
run: |
make test_matrix
Expand Down
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
## File system
.DS_Store
Cargo.lock

## Build
/target
Expand Down
Loading

0 comments on commit 8cb23f1

Please sign in to comment.