From c3705802e4af59ef280bd973b593fcb2fe922f79 Mon Sep 17 00:00:00 2001
From: user202729 <25191436+user202729@users.noreply.github.com>
Date: Mon, 17 Feb 2025 15:59:16 +0700
Subject: [PATCH] Merge two report steps

---
 .github/workflows/ci-meson.yml | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/ci-meson.yml b/.github/workflows/ci-meson.yml
index eb8784fb650..228767fc32e 100644
--- a/.github/workflows/ci-meson.yml
+++ b/.github/workflows/ci-meson.yml
@@ -82,14 +82,6 @@ jobs:
           ./tools/test-git-no-uncommitted-changes
         continue-on-error: true
 
-      - name: Show files changed by update-meson
-        if: ${{ steps.check_update_meson.outcome == 'failure' }}
-        shell: bash -l {0}
-        run: |
-          git add --intent-to-add .  # also show newly created files in git diff
-          git status
-          git diff
-
       - name: Verify dependencies
         shell: bash -l {0}
         run: pip check
@@ -101,12 +93,14 @@ jobs:
           rm -R ./src/sage_setup/
           ./sage -t --all -p4
 
-      - name: Report update-meson failure
+      - name: Show files changed by update-meson
         if: ${{ steps.check_update_meson.outcome == 'failure' }}
         shell: bash -l {0}
+        # must be after "Test" since we still want to run test when check_update_meson fails
         run: |
-          # Please see step 'Show files changed by update-meson' above and apply the changes,
-          # or run tools/update-meson.py locally
+          git add --intent-to-add .  # also show newly created files in git diff
+          git status
+          git diff
           false
 
       - name: Upload log