Skip to content

Commit c0572aa

Browse files
bors[bot]xFrednet
andauthored
Merge #62
62: Minor cleanup in cargo-linter and stable CI r=xFrednet a=xFrednet A small cleanup PR, not much to say, just a few nice changes, before I try to rework more things in `cargo-linter` As always, happy about reviews, but I'll merge this, if there has been no progress by the next PR :) --- Closes #61 and progress on #60 Co-authored-by: xFrednet <[email protected]>
2 parents f399207 + 51b65d9 commit c0572aa

File tree

12 files changed

+181
-91
lines changed

12 files changed

+181
-91
lines changed

.cargo/config.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[alias]
2-
linter = "run --bin cargo-linter -- -l ./linter_lints"
2+
linter = "run --features dev-build --bin cargo-linter -- linter -l ./linter_lints"
33
uitest = "test --test compile_test"

.github/workflows/rust.yml

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ jobs:
3838
- uses: actions/checkout@v3
3939
- uses: actions-rs/toolchain@v1
4040
with:
41-
toolchain: nightly-2022-11-03
42-
components: cargo, clippy, rustfmt
41+
toolchain: nightly-2022-11-03
42+
components: cargo, clippy, rustfmt
4343
- run: rustc -vV
4444
- run: cargo build
4545

@@ -48,3 +48,24 @@ jobs:
4848
- run: cargo clippy
4949
- run: cargo fmt --check
5050
- run: cargo doc
51+
52+
# This task ensures, required packages can be build with a stable toolchain
53+
# the only package requiring nightly should be `linter_driver_rustc` and
54+
# optionally `linter_adapter`
55+
rust-crates-build-stable:
56+
runs-on: ubuntu-latest
57+
58+
# Setup
59+
steps:
60+
- uses: actions/checkout@v3
61+
- run: rm rust-toolchain
62+
- uses: actions-rs/toolchain@v1
63+
with:
64+
toolchain: stable
65+
components: cargo
66+
- run: rustc -vV
67+
68+
# Test
69+
- run: cargo build --package cargo-linter
70+
- run: cargo build --package linter_api
71+
- run: cargo build --package linter_lints

.github/workflows/rust_bors.yml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,3 +43,24 @@ jobs:
4343
- run: cargo clippy
4444
- run: cargo fmt --check
4545
- run: cargo doc
46+
47+
# This task ensures, required packages can be build with a stable toolchain
48+
# the only package requiring nightly should be `linter_driver_rustc` and
49+
# optionally `linter_adapter`
50+
rust-crates-build-stable:
51+
runs-on: ubuntu-latest
52+
53+
# Setup
54+
steps:
55+
- uses: actions/checkout@v3
56+
- run: rm rust-toolchain
57+
- uses: actions-rs/toolchain@v1
58+
with:
59+
toolchain: stable
60+
components: cargo
61+
- run: rustc -vV
62+
63+
# Test
64+
- run: cargo build --package cargo-linter
65+
- run: cargo build --package linter_api
66+
- run: cargo build --package linter_lints

Cargo.lock

Lines changed: 26 additions & 36 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

bors.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ status = [
22
"rust (ubuntu-latest)",
33
"rust (windows-latest)",
44
"rust (macos-latest)",
5+
"rust-crates-build-stable",
56
]
67
delete_merged_branches = true
78
timeout_sec = 1200 # 20 min

cargo-linter/Cargo.toml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,11 @@ edition = "2021"
55
license = "MIT OR Apache-2.0"
66

77
[dependencies]
8-
clap = "3.1.2"
8+
clap = "4.0.26"
9+
once_cell = "1.16.0"
910

1011
[features]
11-
default = ["dev-build"]
12+
default = []
1213
# Indicates that development features like auto driver building etc should be enabled.
1314
# This option assumes that it's being executed at the project root.
1415
dev-build = []

0 commit comments

Comments
 (0)