Skip to content

Commit 386eaa3

Browse files
committed
chore: detaching fork fix
1 parent 3fa3f36 commit 386eaa3

File tree

4 files changed

+31
-48
lines changed

4 files changed

+31
-48
lines changed

.github/workflows/rust.yml

Lines changed: 26 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -9,48 +9,42 @@ jobs:
99
runs-on: ubuntu-latest
1010
steps:
1111
- name: Checkout sources
12-
uses: actions/checkout@v2
12+
uses: actions/checkout@v6
1313
- name: Install rust
14-
uses: actions-rs/toolchain@v1
14+
uses: dtolnay/rust-toolchain@stable
1515
with:
1616
toolchain: 1.85.0
1717
components: rustfmt
18-
profile: minimal
1918
override: true
20-
- name: Run rustfmt
21-
uses: actions-rs/cargo@v1
22-
with:
23-
command: fmt
24-
args: --all -- --check
19+
- name: Check formatting
20+
run: |
21+
cargo fmt --all -- --check
2522
2623
clippy:
2724
name: Clippy
2825
runs-on: ubuntu-latest
2926
steps:
3027
- name: Checkout sources
31-
uses: actions/checkout@v2
28+
uses: actions/checkout@v6
3229
with:
3330
submodules: true
3431
- name: Install rust
35-
uses: actions-rs/toolchain@v1
32+
uses: dtolnay/rust-toolchain@stable
3633
with:
3734
toolchain: 1.85.0
3835
components: clippy
39-
profile: minimal
4036
override: true
4137
- run: sudo apt update && sudo apt install -y libclang-dev
4238
- name: Run clippy
43-
uses: actions-rs/clippy-check@v1
44-
with:
45-
token: ${{ secrets.GITHUB_TOKEN }}
46-
args: --all --tests -- -A clippy::upper-case-acronyms -A clippy::missing_safety_doc -D warnings
39+
run: |
40+
cargo clippy --all --tests -- -A clippy::upper-case-acronyms -A clippy::missing_safety_doc -D warnings
4741
4842
audit:
4943
name: Security audit
5044
runs-on: ubuntu-latest
5145
steps:
52-
- uses: actions/checkout@v2
53-
- uses: actions-rs/audit-check@v1
46+
- uses: actions/checkout@v6
47+
- uses: rustsec/audit-check@v2.0.0
5448
with:
5549
token: ${{ secrets.GITHUB_TOKEN }}
5650

@@ -61,7 +55,7 @@ jobs:
6155
steps:
6256
- run: sudo apt update && sudo apt install -y valgrind libclang-dev
6357
- name: Checkout sources
64-
uses: actions/checkout@v2
58+
uses: actions/checkout@v6
6559
with:
6660
submodules: true
6761
- name: run test
@@ -93,11 +87,11 @@ jobs:
9387
remove-android: 'true'
9488
remove-haskell: 'true'
9589
- name: Checkout sources
96-
uses: actions/checkout@v2
90+
uses: actions/checkout@v6
9791
with:
9892
submodules: true
9993
- name: Install rust
100-
uses: actions-rs/toolchain@v1
94+
uses: dtolnay/rust-toolchain@stable
10195
with:
10296
toolchain: 1.85.0
10397
target: ${{ matrix.target }}
@@ -123,36 +117,25 @@ jobs:
123117
run: clang --version && env
124118
- name: Run librocksdb-sys tests
125119
if: runner.os == 'Linux' || runner.os == 'Windows'
126-
uses: actions-rs/cargo@v1
127-
with:
128-
command: test
129-
args: --manifest-path=librocksdb-sys/Cargo.toml -vvvvv
120+
run: |
121+
cargo test --manifest-path=librocksdb-sys/Cargo.toml -vvvvv
130122
- name: Run rocksdb tests
131123
if: runner.os == 'Linux' || runner.os == 'Windows'
132-
uses: actions-rs/cargo@v1
133-
with:
134-
command: test
124+
run: |
125+
cargo test
135126
- name: Run rocksdb tests (jemalloc)
136127
if: runner.os == 'Linux'
137-
uses: actions-rs/cargo@v1
138-
with:
139-
command: test
140-
args: --features jemalloc
128+
run: |
129+
cargo test --features jemalloc
141130
- name: Run rocksdb tests (io-uring)
142131
if: runner.os == 'Linux'
143-
uses: actions-rs/cargo@v1
144-
with:
145-
command: test
146-
args: --features io-uring
132+
run: |
133+
cargo test --features io-uring
147134
- name: Run rocksdb tests (portable)
148135
if: runner.os == 'Linux' || runner.os == 'macOS'
149-
uses: actions-rs/cargo@v1
150-
with:
151-
command: test
152-
args: --features portable
136+
run: |
137+
cargo test --features portable
153138
- name: Run rocksdb tests (march-native)
154139
if: runner.os == 'Linux'
155-
uses: actions-rs/cargo@v1
156-
with:
157-
command: test
158-
args: --features march-native
140+
run: |
141+
cargo test --features march-native

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ edition = "2024"
66
authors = ["Tyler Neely <t@jujit.su>", "David Greenberg <dsg123456789@gmail.com>", "Nervos Core Dev <dev@nervos.org>"]
77
license = "Apache-2.0"
88
keywords = ["database", "embedded", "LSM-tree", "persistence"]
9-
repository = "https://github.com/nervosnetwork/rust-rocksdb"
9+
repository = "https://github.com/nervosnetwork/ckb-rocksdb"
1010
exclude = [
1111
".gitignore",
1212
"*.yml",

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
rust-rocksdb
1+
ckb-rocksdb
22
============
3-
[![Build Status](https://github.com/nervosnetwork/rust-rocksdb/actions/workflows/rust.yml/badge.svg?branch=txn)](https://github.com/nervosnetwork/rust-rocksdb/actions/workflows/rust.yml?query=branch%3Atxn)
3+
[![Build Status](https://github.com/nervosnetwork/ckb-rocksdb/actions/workflows/rust.yml/badge.svg)](https://github.com/nervosnetwork/ckb-rocksdb/actions/workflows/rust.yml?query=branch%3Amaster)
44
[![crates.io](https://img.shields.io/crates/v/ckb-rocksdb.svg)](https://crates.io/crates/ckb-rocksdb)
55
[![documentation](https://docs.rs/ckb-rocksdb/badge.svg)](https://docs.rs/ckb-rocksdb)
6-
[![license](https://img.shields.io/crates/l/ckb-rocksdb.svg)](https://github.com/nervosnetwork/rust-rocksdb/blob/txn/LICENSE)
6+
[![license](https://img.shields.io/crates/l/ckb-rocksdb.svg)](https://github.com/nervosnetwork/ckb-rocksdb/blob/master/LICENSE)
77
[![Discord](https://img.shields.io/badge/chat-on%20Discord-7289DA.svg)](https://discord.com/invite/nervos)
88

99

librocksdb-sys/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ authors = ["Karl Hobley <karlhobley10@gmail.com>", "Arkadiy Paronyan <arkadiy@et
66
license = "MIT/Apache-2.0/BSD-3-Clause"
77
description = "Native bindings to librocksdb"
88
readme = "README.md"
9-
repository = "https://github.com/nervosnetwork/rust-rocksdb"
9+
repository = "https://github.com/nervosnetwork/ckb-rocksdb"
1010
keywords = [ "ffi", "rocksdb" ]
1111

1212
build = "build.rs"

0 commit comments

Comments
 (0)