try: fix ci

tailcallhq · Nov 7, 2024 · 6943d0f · 6943d0f
1 parent eb5a1fc
commit 6943d0f
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 13 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,6 +1,6 @@
 name: CI
 env:
-  RUSTFLAGS: -D Warnings
+  RUSTFLAGS: -DWarnings
 on:
   push:
     branches:
@@ -23,7 +23,8 @@ jobs:
       uses: actions/checkout@v4
     - uses: actions-rust-lang/setup-rust-toolchain@v1
       with:
-        toolchain: stable,nightly
+        toolchain: stable, nightly
+        components: clippy, rustfmt
     - run: cargo test --all-features --workspace
     - run: cargo +nightly fmt --check
     - run: cargo +nightly clippy --all-features --workspace
diff --git a/workspace/gh-workflow-gen/src/main.rs b/workspace/gh-workflow-gen/src/main.rs
@@ -1,4 +1,4 @@
-use gh_workflow::{Job, Permissions, RustFlags, Step, Toolchain, Workflow};
+use gh_workflow::{Component, Job, Permissions, RustFlags, Step, Toolchain, Workflow};
 
 fn main() {
     let rust_flags = RustFlags::deny("Warnings");
@@ -8,7 +8,8 @@ fn main() {
         .add_step(
             Step::setup_rust()
                 .add_toolchain(Toolchain::Stable)
-                .add_toolchain(Toolchain::Nightly),
+                .add_toolchain(Toolchain::Nightly)
+                .components(vec![Component::Clippy, Component::Rustfmt]),
         )
         .add_step(Step::cargo("test", vec!["--all-features", "--workspace"]))
         .add_step(Step::cargo_nightly("fmt", vec!["--check"]))

diff --git a/workspace/gh-workflow/src/rust_flag.rs b/workspace/gh-workflow/src/rust_flag.rs
@@ -53,12 +53,12 @@ impl Display for RustFlags {
     fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
         match self {
             RustFlags::Lint(name, lint) => match lint {
-                Lint::Allow => write!(f, "-A {}", name),
-                Lint::Warn => write!(f, "-W {}", name),
-                Lint::Deny => write!(f, "-D {}", name),
-                Lint::Forbid => write!(f, "-F {}", name),
-                Lint::Codegen => write!(f, "-C {}", name),
-                Lint::Experiment => write!(f, "-Z {}", name),
+                Lint::Allow => write!(f, "-A{}", name),
+                Lint::Warn => write!(f, "-W{}", name),
+                Lint::Deny => write!(f, "-D{}", name),
+                Lint::Forbid => write!(f, "-F{}", name),
+                Lint::Codegen => write!(f, "-C{}", name),
+                Lint::Experiment => write!(f, "-Z{}", name),
             },
             RustFlags::Combine(lhs, rhs) => write!(f, "{} {}", lhs, rhs),
         }

diff --git a/workspace/gh-workflow/src/toolchain.rs b/workspace/gh-workflow/src/toolchain.rs
@@ -29,7 +29,7 @@ impl Toolchain {
     }
 }
 
-#[derive(Clone)]
+#[derive(Clone, Debug)]
 pub enum Component {
     Clippy,
     Rustfmt,
@@ -172,7 +172,7 @@ impl AddStep for ToolchainStep {
                     format!("{}.{}.{}", major, minor, patch)
                 }
             })
-            .reduce(|acc, a| format!("{},{}", acc, a));
+            .reduce(|acc, a| format!("{}, {}", acc, a));
 
         if let Some(toolchain) = toolchain {
             step = step.with(("toolchain", toolchain));
@@ -195,7 +195,8 @@ impl AddStep for ToolchainStep {
                 .components
                 .iter()
                 .map(|c| c.to_string())
-                .fold("".to_string(), |acc, a| format!("{},{}", acc, a));
+                .reduce(|acc, a| format!("{}, {}", acc, a))
+                .unwrap_or_default();
 
             step = step.with(("components", components));
         }