From 7d1c5099a0e5cd2b6e31c6e33b3ae102ed813f84 Mon Sep 17 00:00:00 2001 From: Connor Skees Date: Sun, 9 Jul 2023 22:12:12 +0000 Subject: [PATCH] install components in ci --- .github/workflows/tests.yml | 8 ++++++-- crates/compiler/Cargo.toml | 3 +-- crates/include_sass/src/lib.rs | 1 + crates/lib/Cargo.toml | 3 +-- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 3d3ea32..c2d3dc4 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -32,7 +32,9 @@ jobs: with: toolchain: "1.59.0" - - run: cargo fmt --all -- --check + - run: | + rustup component add clippy + cargo fmt --all -- --check clippy: runs-on: ubuntu-latest @@ -44,7 +46,9 @@ jobs: with: toolchain: "1.59.0" - - run: cargo clippy --features=macro -- -D warnings + - run: | + rustup component add rustfmt + cargo clippy --features=macro -- -D warnings boostrap: runs-on: ubuntu-latest diff --git a/crates/compiler/Cargo.toml b/crates/compiler/Cargo.toml index 4900f87..b903b45 100644 --- a/crates/compiler/Cargo.toml +++ b/crates/compiler/Cargo.toml @@ -18,8 +18,7 @@ bench = false [package.metadata.docs.rs] # To build locally: -# RUSTDOCFLAGS="--cfg doc_cfg" cargo +nightly doc --all-features --no-deps --open -all-features = true +# RUSTDOCFLAGS="--cfg doc_cfg" cargo +nightly doc --no-deps --open rustdoc-args = ["--cfg", "doc_cfg"] [dependencies] diff --git a/crates/include_sass/src/lib.rs b/crates/include_sass/src/lib.rs index 5f21b79..1127812 100644 --- a/crates/include_sass/src/lib.rs +++ b/crates/include_sass/src/lib.rs @@ -4,6 +4,7 @@ use std::{cell::RefCell, collections::HashSet, path::PathBuf}; use grass_compiler::StdFs; use proc_macro::TokenStream; +#[cfg(not(feature = "nightly"))] use quote::format_ident; use syn::{parse_macro_input, LitStr}; diff --git a/crates/lib/Cargo.toml b/crates/lib/Cargo.toml index 75e84d7..5e0317f 100644 --- a/crates/lib/Cargo.toml +++ b/crates/lib/Cargo.toml @@ -25,8 +25,7 @@ bench = false [package.metadata.docs.rs] # To build locally: -# RUSTDOCFLAGS="--cfg doc_cfg" cargo +nightly doc --all-features --no-deps --open -all-features = true +# RUSTDOCFLAGS="--cfg doc_cfg" cargo +nightly doc --no-deps --open rustdoc-args = ["--cfg", "doc_cfg"] [dependencies]