Skip to content

Commit

Permalink
Merge torrust#745: ci: use cargo-machete to check for unused deps
Browse files Browse the repository at this point in the history
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
  • Loading branch information
da2ce7 committed Oct 3, 2024
2 parents 89ee5bd + 5a6b305 commit 53c320d
Show file tree
Hide file tree
Showing 6 changed files with 168 additions and 207 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:

strategy:
matrix:
toolchain: [stable, nightly]
toolchain: [nightly, stable]

steps:
- id: checkout
Expand Down
7 changes: 1 addition & 6 deletions .github/workflows/e2e.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:

strategy:
matrix:
toolchain: [stable, nightly]
toolchain: [nightly, stable]

steps:
- id: checkout
Expand All @@ -34,11 +34,6 @@ jobs:
name: Enable Job Cache
uses: Swatinem/rust-cache@v2

# Temporary Cleaning to avoid Rust Compiler Bug
- id: clean
name: Make Build Clean
run: cargo clean

- id: test-mysql
name: Run Integration Tests (MySQL)
run: ./contrib/dev-tools/container/e2e/mysql/run-e2e-tests.sh
38 changes: 16 additions & 22 deletions .github/workflows/testing.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,6 @@ jobs:
name: Enable Workflow Cache
uses: Swatinem/rust-cache@v2

# Temporary Cleaning to avoid Rust Compiler Bug
- id: clean
name: Make Build Clean
run: cargo clean

- id: format
name: Run Formatting-Checks
run: cargo fmt --check
Expand All @@ -44,7 +39,7 @@ jobs:

strategy:
matrix:
toolchain: [stable, nightly]
toolchain: [nightly, stable]

steps:
- id: checkout
Expand All @@ -62,10 +57,11 @@ jobs:
name: Enable Workflow Cache
uses: Swatinem/rust-cache@v2

# Temporary Cleaning to avoid Rust Compiler Bug
- id: clean
name: Make Build Clean
run: cargo clean
- id: tools
name: Install Tools
uses: taiki-e/install-action@v2
with:
tool: cargo-machete

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

- id: clean
name: Clean Build Directory
run: cargo clean

- id: deps
name: Check Unused Dependencies
run: cargo machete

unit:
name: Units
runs-on: ubuntu-latest
needs: check

strategy:
matrix:
toolchain: [stable, nightly]
toolchain: [nightly, stable]

steps:
- id: checkout
Expand All @@ -106,11 +110,6 @@ jobs:
name: Enable Job Cache
uses: Swatinem/rust-cache@v2

# Temporary Cleaning to avoid Rust Compiler Bug
- id: clean
name: Make Build Clean
run: cargo clean

- id: imdl
name: Install Intermodal
run: cargo install imdl
Expand All @@ -130,7 +129,7 @@ jobs:

strategy:
matrix:
toolchain: [stable, nightly]
toolchain: [nightly, stable]

steps:
- id: checkout
Expand All @@ -147,11 +146,6 @@ jobs:
name: Enable Job Cache
uses: Swatinem/rust-cache@v2

# Temporary Cleaning to avoid Rust Compiler Bug
- id: clean
name: Make Build Clean
run: cargo clean

- id: test-sqlite
name: Run Integration Tests (SQLite)
run: ./contrib/dev-tools/container/e2e/sqlite/run-e2e-tests.sh
Expand Down
Loading

0 comments on commit 53c320d

Please sign in to comment.