Group logs on GitHub Actions

taiki-e · Sep 6, 2023 · 100d7c9 · 100d7c9
1 parent 58d1d91
commit 100d7c9
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 3 deletions.
diff --git a/.github/.cspell/project-dictionary.txt b/.github/.cspell/project-dictionary.txt
@@ -1,5 +1,6 @@
 binstall
 compat
+endgroup
 pacman
 qpmember
 subcrate

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -62,11 +62,17 @@ jobs:
       - name: Install Rust
         run: rustup toolchain add ${{ matrix.rust }} --no-self-update && rustup default ${{ matrix.rust }}
       - run: rustup toolchain add nightly --no-self-update
-      - uses: taiki-e/install-action@cargo-hack
-      - uses: taiki-e/install-action@cargo-minimal-versions
       - run: echo "RUSTFLAGS=${RUSTFLAGS} -C target-feature=+crt-static" >>"${GITHUB_ENV}"
         if: startsWith(matrix.os, 'windows')
       - run: cargo test --workspace --all-features
+      - run: |
+          set -euxo pipefail
+          cargo install --path . --debug
+          cd tests/fixtures/real
+          cargo hack check --feature-powerset --workspace
+          cargo uninstall cargo-hack
+      - uses: taiki-e/install-action@cargo-hack
+      - uses: taiki-e/install-action@cargo-minimal-versions
       - run: cargo minimal-versions build --workspace --all-features --ignore-private
 
   build:

diff --git a/src/context.rs b/src/context.rs
@@ -28,6 +28,7 @@ pub(crate) struct Context {
     pub(crate) restore: restore::Manager,
     pub(crate) current_dir: PathBuf,
     pub(crate) version_range: Option<Vec<(u32, String)>>,
+    pub(crate) use_github_action_grouping: bool,
 }
 
 impl Context {
@@ -74,6 +75,8 @@ impl Context {
             restore,
             current_dir: env::current_dir()?,
             version_range: None,
+            // TODO: should be optional?
+            use_github_action_grouping: env::var_os("GITHUB_ACTIONS").is_some(),
         };
 
         this.version_range = this

diff --git a/src/main.rs b/src/main.rs
@@ -498,7 +498,19 @@ fn exec_cargo_inner(
         write!(msg, "running {line} on {}", cx.packages(id).name).unwrap();
     }
     write!(msg, " ({}/{})", progress.count, progress.total).unwrap();
-    info!("{msg}");
+    let _guard = if cx.use_github_action_grouping {
+        struct Guard;
+        impl Drop for Guard {
+            fn drop(&mut self) {
+                println!("::endgroup::");
+            }
+        }
+        println!("::group::{msg}");
+        Some(Guard)
+    } else {
+        info!("{msg}");
+        None
+    };
 
     line.run()
 }

diff --git a/tests/auxiliary/mod.rs b/tests/auxiliary/mod.rs
@@ -22,6 +22,7 @@ pub fn cargo_bin_exe() -> Command {
     cmd.env("CARGO_HACK_DENY_WARNINGS", "true");
     cmd.env_remove("RUSTFLAGS");
     cmd.env_remove("CARGO_TERM_COLOR");
+    cmd.env_remove("GITHUB_ACTIONS");
     cmd
 }