Skip to content

Commit 2ae3d35

Browse files
PanaPana
committed
merge master
2 parents a4e124d + 9563a1d commit 2ae3d35

File tree

164 files changed

+2005
-2234
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

164 files changed

+2005
-2234
lines changed

‎.github/workflows/docs.yml‎

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,31 +5,39 @@ on:
55
branches:
66
- master
77

8+
concurrency:
9+
group: ${{ github.workflow }}-${{ github.ref }}
10+
cancel-in-progress: true
11+
12+
env:
13+
SCCACHE_GHA_ENABLED: "true"
14+
RUSTC_WRAPPER: "sccache"
15+
816
jobs:
917
deploy:
1018
permissions:
1119
contents: write
1220
runs-on: ubuntu-24.04
1321
steps:
1422
- uses: actions/checkout@v4
15-
16-
- name: Rust Cache
17-
uses: Swatinem/rust-cache@v2
18-
with:
19-
prefix-key: "nightly-2024-02-04"
20-
23+
24+
- name: Run sccache-cache
25+
uses: mozilla-actions/[email protected]
26+
2127
- name: Install Dependencies
2228
uses: ./.github/actions/install-dependencies
29+
- name: Setup Cargo Cache
30+
uses: ./.github/actions/setup-cargo-cache
2331

2432
- name: Generate documentation
2533
env:
2634
CMAKE_POLICY_VERSION_MINIMUM: 3.5
27-
RUSTDOCFLAGS: '--enable-index-page -Z unstable-options'
35+
RUSTDOCFLAGS: "--enable-index-page -Z unstable-options"
2836
run: |
2937
rustup default nightly-2024-04-22 && cargo +nightly-2024-04-22 doc --no-deps
3038
3139
- name: Deploy
3240
uses: peaceiris/actions-gh-pages@v3
3341
with:
3442
github_token: ${{ secrets.GITHUB_TOKEN }}
35-
publish_dir: ./target/doc
43+
publish_dir: ./target/doc

‎.github/workflows/lint.yml‎

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -24,42 +24,40 @@ on:
2424
- "cargo_fmt.sh"
2525
- "CODEOWNERS"
2626

27+
concurrency:
28+
group: ${{ github.workflow }}-${{ github.ref }}
29+
cancel-in-progress: true
30+
31+
env:
32+
SCCACHE_GHA_ENABLED: "true"
33+
RUSTC_WRAPPER: "sccache"
34+
2735
jobs:
2836
lint:
2937
runs-on: ubuntu-24.04
3038
steps:
3139
- uses: actions/checkout@v4
3240

41+
- name: Run sccache-cache
42+
uses: mozilla-actions/[email protected]
3343
- name: Setup Cargo Cache
3444
uses: ./.github/actions/setup-cargo-cache
35-
36-
- name: Cache build artifacts
37-
uses: actions/cache@v4
38-
with:
39-
path: |
40-
target/release/deps
41-
target/release/.fingerprint
42-
target/release/build
43-
!target/release/build/**/out
44-
!target/release/incremental
45-
!target/release/.cargo-lock
46-
key: ${{ runner.os }}-build-lint-release-${{ hashFiles('**/Cargo.lock') }}
47-
restore-keys: |
48-
${{ runner.os }}-build-lint-release-
49-
5045
- name: Install Dependencies
5146
uses: ./.github/actions/install-dependencies
5247

5348
- name: Check format and run clippy
5449
run: |
5550
./cargo_fmt.sh --install && ./cargo_fmt.sh -- --check && ./dev-support/cargo_all.sh clippy --release --all -- -A warnings
56-
5751
cargo-deny:
5852
runs-on: ubuntu-24.04
5953
steps:
6054
- uses: actions/checkout@v4
6155
# - uses: EmbarkStudios/cargo-deny-action@v2
56+
- name: Setup Cargo Cache
57+
uses: ./.github/actions/setup-cargo-cache
58+
- name: Run sccache-cache
59+
uses: mozilla-actions/[email protected]
6260
- name: cargo-deny
6361
run: |
6462
cargo install --locked cargo-deny --version 0.15.1
65-
./dev-support/cargo_all.sh deny check
63+
./dev-support/cargo_all.sh deny check

‎.github/workflows/test.yml‎

Lines changed: 39 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ name: Tests
22

33
env:
44
RUST_VERSION: 1.77.2
5+
SCCACHE_GHA_ENABLED: "true"
6+
RUSTC_WRAPPER: "sccache"
57

68
on:
79
push:
@@ -27,73 +29,66 @@ on:
2729
- "cargo_fmt.sh"
2830
- "CODEOWNERS"
2931

32+
concurrency:
33+
group: ${{ github.workflow }}-${{ github.ref }}
34+
cancel-in-progress: true
35+
3036
jobs:
31-
check-crates:
37+
check-workspace:
3238
runs-on: ubuntu-24.04
3339
steps:
3440
- uses: actions/checkout@v4
35-
36-
- name: Setup Cargo Cache
37-
uses: ./.github/actions/setup-cargo-cache
38-
3941
- name: Free up space
4042
run: |
4143
sudo rm -rf /usr/share/dotnet /usr/local/lib/android
42-
43-
- name: Cache debug build artifacts
44-
uses: actions/cache@v4
45-
with:
46-
path: |
47-
target/debug/deps
48-
target/debug/.fingerprint
49-
target/debug/build
50-
!target/debug/build/**/out
51-
key: ${{ runner.os }}-conflux-debug-${{ env.RUST_VERSION }}-${{ hashFiles('Cargo.lock') }}
52-
restore-keys: |
53-
${{ runner.os }}-conflux-debug-${{ env.RUST_VERSION }}-
44+
- name: Setup Cargo Cache
45+
uses: ./.github/actions/setup-cargo-cache
46+
- name: Run sccache-cache
47+
uses: mozilla-actions/[email protected]
5448

5549
- name: Install Dependencies
5650
uses: ./.github/actions/install-dependencies
57-
58-
- name: Check individual crates
59-
run: |
60-
./dev-support/check-crates.sh
61-
6251
- name: Check workspace
6352
env:
6453
RUSTFLAGS: -D warnings
6554
run: |
6655
cargo check --all --locked
6756
68-
workspace-tests:
57+
check-individual-crates:
6958
runs-on: ubuntu-24.04
7059
steps:
7160
- uses: actions/checkout@v4
7261
- name: Free up space
7362
run: |
7463
sudo rm -rf /usr/share/dotnet /usr/local/lib/android
75-
7664
- name: Setup Cargo Cache
7765
uses: ./.github/actions/setup-cargo-cache
66+
- name: Run sccache-cache
67+
uses: mozilla-actions/[email protected]
7868

79-
- name: Cache build artifacts
80-
uses: actions/cache@v4
81-
with:
82-
path: |
83-
target/release/deps
84-
target/release/.fingerprint
85-
target/release/build
86-
!target/release/build/**/out
87-
key: ${{ runner.os }}-conflux-release-${{ env.RUST_VERSION }}-${{ hashFiles('Cargo.lock') }}
88-
restore-keys: |
89-
${{ runner.os }}-conflux-release-${{ env.RUST_VERSION }}-
69+
- name: Install Dependencies
70+
uses: ./.github/actions/install-dependencies
71+
- name: Check individual crates
72+
run: |
73+
./dev-support/check-crates.sh
9074
75+
workspace-tests:
76+
runs-on: ubuntu-24.04
77+
steps:
78+
- uses: actions/checkout@v4
79+
- name: Free up space
80+
run: |
81+
sudo rm -rf /usr/share/dotnet /usr/local/lib/android
82+
- name: Setup Cargo Cache
83+
uses: ./.github/actions/setup-cargo-cache
84+
- name: Run sccache-cache
85+
uses: mozilla-actions/[email protected]
9186
- name: Install Dependencies
9287
uses: ./.github/actions/install-dependencies
9388

9489
- name: Run build bench
9590
env:
96-
RUSTFLAGS: -D warnings
91+
RUSTFLAGS: -D warnings
9792
run: |
9893
cargo bench --all --no-run
9994
@@ -111,22 +106,10 @@ jobs:
111106
- name: Free up space
112107
run: |
113108
sudo rm -rf /usr/share/dotnet /usr/local/lib/android
114-
115109
- name: Setup Cargo Cache
116110
uses: ./.github/actions/setup-cargo-cache
117-
118-
- name: Cache debug build artifacts
119-
uses: actions/cache@v4
120-
with:
121-
path: |
122-
target/debug/deps
123-
target/debug/.fingerprint
124-
target/debug/build
125-
!target/debug/build/**/out
126-
key: ${{ runner.os }}-cfx-addr-debug-${{ env.RUST_VERSION }}-${{ hashFiles('Cargo.lock') }}
127-
restore-keys: |
128-
${{ runner.os }}-cfx-addr-debug-${{ env.RUST_VERSION }}-
129-
111+
- name: Run sccache-cache
112+
uses: mozilla-actions/[email protected]
130113
- name: Install Dependencies
131114
uses: ./.github/actions/install-dependencies
132115

@@ -141,9 +124,10 @@ jobs:
141124
runs-on: ubuntu-24.04
142125
steps:
143126
- uses: actions/checkout@v4
144-
145127
- name: Setup Cargo Cache
146128
uses: ./.github/actions/setup-cargo-cache
129+
- name: Run sccache-cache
130+
uses: mozilla-actions/[email protected]
147131

148132
- name: Install Dependencies
149133
uses: ./.github/actions/install-dependencies
@@ -162,22 +146,10 @@ jobs:
162146
- name: Free up space
163147
run: |
164148
sudo rm -rf /usr/share/dotnet /usr/local/lib/android
165-
166149
- name: Setup Cargo Cache
167150
uses: ./.github/actions/setup-cargo-cache
168-
169-
- name: Cache release artifacts
170-
uses: actions/cache@v4
171-
with:
172-
path: |
173-
tools/evm-spec-tester/target/release/deps
174-
tools/evm-spec-tester/target/release/.fingerprint
175-
tools/evm-spec-tester/target/release/build
176-
!tools/evm-spec-tester/target/release/build/**/out
177-
key: ${{ runner.os }}-evm-spec-tester-release-${{ env.RUST_VERSION }}-${{ hashFiles('tools/evm-spec-tester/Cargo.lock') }}
178-
restore-keys: |
179-
${{ runner.os }}-evm-spec-tester-release-${{ env.RUST_VERSION }}-
180-
151+
- name: Run sccache-cache
152+
uses: mozilla-actions/[email protected]
181153
- name: Install Dependencies
182154
uses: ./.github/actions/install-dependencies
183155

@@ -194,7 +166,6 @@ jobs:
194166
RUSTFLAGS: -D warnings
195167
run: cargo run --release --locked -- statetest ../../testdata/evm-spec-test
196168

197-
198169
consensus-bench-test:
199170
runs-on: ubuntu-24.04
200171
steps:
@@ -203,21 +174,10 @@ jobs:
203174
- name: Free up space
204175
run: |
205176
sudo rm -rf /usr/share/dotnet /usr/local/lib/android
206-
207177
- name: Setup Cargo Cache
208178
uses: ./.github/actions/setup-cargo-cache
209-
210-
- name: Cache release artifacts
211-
uses: actions/cache@v4
212-
with:
213-
path: |
214-
tools/consensus_bench/target/debug/deps
215-
tools/consensus_bench/target/debug/.fingerprint
216-
tools/consensus_bench/target/debug/build
217-
!tools/consensus_bench/target/debug/build/**/out
218-
key: ${{ runner.os }}-consensus-bench-debug-${{ env.RUST_VERSION }}-${{ hashFiles('tools/consensus_bench/Cargo.lock') }}
219-
restore-keys: |
220-
${{ runner.os }}-consensus-bench-debug-${{ env.RUST_VERSION }}-
179+
- name: Run sccache-cache
180+
uses: mozilla-actions/[email protected]
221181

222182
- name: Install Dependencies
223183
uses: ./.github/actions/install-dependencies
@@ -228,4 +188,3 @@ jobs:
228188
RUSTFLAGS: -D warnings
229189
run: |
230190
cargo check --locked
231-

0 commit comments

Comments
 (0)