Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make rustfmt&clippy run on stable #3

Closed
wants to merge 2 commits into from
Closed

Make rustfmt&clippy run on stable #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4eb9591
Install clippy & rustfmt on stable, no more -preview components
antifuchs Jan 5, 2019
aa2b23a
Run with these settings
antifuchs Jan 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions .travis.yml
View file
Open in desktop
@@ -1,4 +1,4 @@
# TemplateCIConfig { bench: BenchEntry { run: false, version: "nightly", allow_failure: false, install_commandline: None, commandline: "cargo bench" }, clippy: ClippyEntry { run: true, version: "nightly", allow_failure: false, install_commandline: None, commandline: "cargo clippy -- -D warnings" }, rustfmt: RustfmtEntry { run: true, version: "stable", allow_failure: false, install_commandline: None, commandline: "cargo fmt" }, additional_matrix_entries: {"something_custom": CustomEntry { run: false, version: "stable", allow_failure: false, install_commandline: Some("echo \"installing for custom tests\""), commandline: "echo \"running custom tests\"" }}, os: "linux", dist: "xenial", versions: ["stable", "beta", "nightly"], test_commandline: "cargo test --verbose --all" }
# TemplateCIConfig { bench: BenchEntry { run: false, version: "nightly", allow_failure: false, install_commandline: None, commandline: "cargo bench" }, clippy: ClippyEntry { run: true, version: "stable", allow_failure: false, install_commandline: None, commandline: "cargo clippy -- -D warnings" }, rustfmt: RustfmtEntry { run: true, version: "stable", allow_failure: false, install_commandline: None, commandline: "cargo fmt" }, additional_matrix_entries: {"something_custom": CustomEntry { run: false, version: "stable", allow_failure: false, install_commandline: Some("echo \"installing for custom tests\""), commandline: "echo \"running custom tests\"" }}, cache: "cargo", os: "linux", dist: "xenial", versions: ["stable", "beta", "nightly"], test_commandline: "cargo test --verbose --all" }
os:
- "linux"
dist: "xenial"
Expand Down Expand Up @@ -28,7 +28,7 @@ matrix:
- RUN_RUSTFMT=true
- RUN_TEST=false
- &clippy_build
rust: "nightly"
rust: "stable"
env:
- RUN_CLIPPY=true
- RUN_TEST=false
Expand All @@ -41,12 +41,12 @@ matrix:

before_script:
- bash -c 'if [[ "$RUN_RUSTFMT" == "true" ]]; then
rustup component add rustfmt-preview
rustup component add rustfmt
;
fi'
- bash -c 'if [[ "$RUN_CLIPPY" == "true" ]]; then
rm -f ~/.cargo/bin/clippy;
rustup component add clippy-preview
rustup component add clippy
;
fi'
- bash -c 'if [[ "$RUN_SOMETHING_CUSTOM" == "true" ]]; then
Expand Down
2 changes: 1 addition & 1 deletion src/main.rs
View file
Open in desktop
Expand Up @@ -99,7 +99,7 @@ define_matrix_entry!(
ClippyEntry,
(
true,
"nightly",
"stable",
false,
Some("cargo clippy -- -D warnings".to_owned())
)
Expand Down
4 changes: 2 additions & 2 deletions templates/travis.yml
View file
Open in desktop
Expand Up @@ -65,14 +65,14 @@ matrix:
before_script:
{%- if rustfmt.run %}
- bash -c 'if [[ "$RUN_RUSTFMT" == "true" ]]; then
rustup component add rustfmt-preview
rustup component add rustfmt
;
fi'
{%- endif %}
{%- if clippy.run %}
- bash -c 'if [[ "$RUN_CLIPPY" == "true" ]]; then
rm -f ~/.cargo/bin/clippy;
rustup component add clippy-preview
rustup component add clippy
;
fi'
{%- endif %}
Expand Down