diff --git a/.github/workflows/diff.yml b/.github/workflows/diff.yml index a6d40960..47b5ecc4 100644 --- a/.github/workflows/diff.yml +++ b/.github/workflows/diff.yml @@ -8,7 +8,7 @@ jobs: runs-on: ubuntu-latest outputs: diffs: ${{ steps.regress-ci.outputs.diffs }} - if: ${{ github.event.issue.pull_request }} + if: github.event.issue.pull_request && (contains(github.event.comment.body, '\n/ci') || startsWith(github.event.comment.body, '/ci')) steps: - uses: actions/checkout@v4 @@ -55,7 +55,7 @@ jobs: with: tool: git-delta - - run: cargo regress diff ${{ matrix.command }} --use-pager-directly + - run: cargo regress diff --use-pager-directly ${{ matrix.command }} env: GH_TOKEN: ${{ github.token }} GITHUB_PR: ${{ matrix.pr }} @@ -63,7 +63,7 @@ jobs: summary: runs-on: ubuntu-latest needs: [diff, generate] - if: always() && needs.generate.outputs.diffs != '{}' && needs.generate.outputs.diffs != '[]' && needs.generate.outputs.diffs != '' + if: always() && needs.generate.outputs.diffs != '{}' && needs.generate.outputs.diffs != '[]' && needs.generate.outputs.diffs != '' && needs.generate.result == 'success' steps: - uses: actions/checkout@v4 diff --git a/ci/svd2rust-regress/src/svd_test.rs b/ci/svd2rust-regress/src/svd_test.rs index bdb595c6..7f0f290f 100644 --- a/ci/svd2rust-regress/src/svd_test.rs +++ b/ci/svd2rust-regress/src/svd_test.rs @@ -4,7 +4,7 @@ use svd2rust::{util::ToSanitizedCase, Target}; use crate::{command::CommandExt, tests::TestCase, Opts, TestOpts}; use std::io::prelude::*; use std::path::PathBuf; -use std::process::{Command, Output}; +use std::process::Command; use std::{ fmt::Write as _, fs::{self, File, OpenOptions}, @@ -340,7 +340,7 @@ impl TestCase { src_files.sort(); for entry in src_files { - let output = Command::new(rustfmt_bin_path) + Command::new(rustfmt_bin_path) .arg(entry) .args(["--edition", "2021"]) .capture_outputs(