Skip to content

Commit 53c320d

Browse files
committed
Merge #745: ci: use cargo-machete to check for unused deps
5a6b305 update deps: (Cameron Garnham) 14c26d4 ci: use machete to check for unused deps (Cameron Garnham) 1ee60a9 cargo: removed unused deps (Cameron Garnham) e3e1d66 ci: remove unneeded cleaning steps (Cameron Garnham) Pull request description: Removed `fern`, `trace`, and `rustversion` , added ci check, and updated the deps. ACKs for top commit: da2ce7: ACK 5a6b305 Tree-SHA512: 5efecb2b26d33357d3088c2ea9bb1dfa4d97bf1b0aa10fd418a5210e9dc4c179c9c6b1f27daff0ad00ba6041c61b1e7cf39d7ac6ed48d44688aaa93b4dd32258
2 parents 89ee5bd + 5a6b305 commit 53c320d

File tree

6 files changed

+168
-207
lines changed

6 files changed

+168
-207
lines changed

.github/workflows/deployment.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212

1313
strategy:
1414
matrix:
15-
toolchain: [stable, nightly]
15+
toolchain: [nightly, stable]
1616

1717
steps:
1818
- id: checkout

.github/workflows/e2e.yaml

+1-6
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717

1818
strategy:
1919
matrix:
20-
toolchain: [stable, nightly]
20+
toolchain: [nightly, stable]
2121

2222
steps:
2323
- id: checkout
@@ -34,11 +34,6 @@ jobs:
3434
name: Enable Job Cache
3535
uses: Swatinem/rust-cache@v2
3636

37-
# Temporary Cleaning to avoid Rust Compiler Bug
38-
- id: clean
39-
name: Make Build Clean
40-
run: cargo clean
41-
4237
- id: test-mysql
4338
name: Run Integration Tests (MySQL)
4439
run: ./contrib/dev-tools/container/e2e/mysql/run-e2e-tests.sh

.github/workflows/testing.yaml

+16-22
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,6 @@ jobs:
2828
name: Enable Workflow Cache
2929
uses: Swatinem/rust-cache@v2
3030

31-
# Temporary Cleaning to avoid Rust Compiler Bug
32-
- id: clean
33-
name: Make Build Clean
34-
run: cargo clean
35-
3631
- id: format
3732
name: Run Formatting-Checks
3833
run: cargo fmt --check
@@ -44,7 +39,7 @@ jobs:
4439

4540
strategy:
4641
matrix:
47-
toolchain: [stable, nightly]
42+
toolchain: [nightly, stable]
4843

4944
steps:
5045
- id: checkout
@@ -62,10 +57,11 @@ jobs:
6257
name: Enable Workflow Cache
6358
uses: Swatinem/rust-cache@v2
6459

65-
# Temporary Cleaning to avoid Rust Compiler Bug
66-
- id: clean
67-
name: Make Build Clean
68-
run: cargo clean
60+
- id: tools
61+
name: Install Tools
62+
uses: taiki-e/install-action@v2
63+
with:
64+
tool: cargo-machete
6965

7066
- id: check
7167
name: Run Build Checks
@@ -81,14 +77,22 @@ jobs:
8177
RUSTDOCFLAGS: "-D warnings"
8278
run: cargo doc --no-deps --bins --examples --workspace --all-features
8379

80+
- id: clean
81+
name: Clean Build Directory
82+
run: cargo clean
83+
84+
- id: deps
85+
name: Check Unused Dependencies
86+
run: cargo machete
87+
8488
unit:
8589
name: Units
8690
runs-on: ubuntu-latest
8791
needs: check
8892

8993
strategy:
9094
matrix:
91-
toolchain: [stable, nightly]
95+
toolchain: [nightly, stable]
9296

9397
steps:
9498
- id: checkout
@@ -106,11 +110,6 @@ jobs:
106110
name: Enable Job Cache
107111
uses: Swatinem/rust-cache@v2
108112

109-
# Temporary Cleaning to avoid Rust Compiler Bug
110-
- id: clean
111-
name: Make Build Clean
112-
run: cargo clean
113-
114113
- id: imdl
115114
name: Install Intermodal
116115
run: cargo install imdl
@@ -130,7 +129,7 @@ jobs:
130129

131130
strategy:
132131
matrix:
133-
toolchain: [stable, nightly]
132+
toolchain: [nightly, stable]
134133

135134
steps:
136135
- id: checkout
@@ -147,11 +146,6 @@ jobs:
147146
name: Enable Job Cache
148147
uses: Swatinem/rust-cache@v2
149148

150-
# Temporary Cleaning to avoid Rust Compiler Bug
151-
- id: clean
152-
name: Make Build Clean
153-
run: cargo clean
154-
155149
- id: test-sqlite
156150
name: Run Integration Tests (SQLite)
157151
run: ./contrib/dev-tools/container/e2e/sqlite/run-e2e-tests.sh

0 commit comments

Comments
 (0)