From e1ee6af27561452b44f8766bc84bdea878ef09c0 Mon Sep 17 00:00:00 2001 From: Rob Parrett Date: Mon, 22 Apr 2024 14:47:56 -0700 Subject: [PATCH] Improve output of example showcase patches CI workflow (#12609) # Objective Fixes #12539 Improve [this CI output](https://github.com/bevyengine/bevy/actions/runs/8367408952/job/22909715870#step:7:11). ## Solution - Don't stop after the first failure. - Print the filename of the patch(es) that failed. - Clean up an unused package install while we're at it. Tested over here: https://github.com/rparrett/bevy/pull/20 --------- Co-authored-by: BD103 <59022059+BD103@users.noreply.github.com> --- .github/workflows/validation-jobs.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/validation-jobs.yml b/.github/workflows/validation-jobs.yml index 34bc3f3e4a..b4ae9e0994 100644 --- a/.github/workflows/validation-jobs.yml +++ b/.github/workflows/validation-jobs.yml @@ -7,7 +7,6 @@ on: branches: - main - concurrency: group: ${{github.workflow}}-${{github.ref}} cancel-in-progress: ${{github.event_name == 'pull_request'}} @@ -299,14 +298,15 @@ jobs: target/ key: ${{ runner.os }}-cargo-check-showcase-patches-${{ hashFiles('**/Cargo.toml') }} - uses: dtolnay/rust-toolchain@stable - - name: Installs cargo-udeps - run: cargo install --force cargo-udeps - name: Install Linux dependencies uses: ./.github/actions/install-linux-deps - name: Apply patches run: | + CODE=0 for patch in tools/example-showcase/*.patch; do - git apply --ignore-whitespace $patch + # Try applying the patch, logging an error if it fails. + git apply --ignore-whitespace $patch || { echo "::error::$patch failed to apply."; CODE=1; } done + exit $CODE - name: Build with patches run: cargo build