Skip to content

Commit d796a29

Browse files
committed
Disable running test step when update-meson check fails
1 parent c370580 commit d796a29

File tree

1 file changed

+6
-13
lines changed

1 file changed

+6
-13
lines changed

.github/workflows/ci-meson.yml

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -76,11 +76,14 @@ jobs:
7676
# this step must be after build, because meson.build creates a number of __init__.py files
7777
# that is needed to make tools/update-meson.py run correctly
7878
shell: bash -l {0}
79-
id: check_update_meson
8079
run: |
8180
python3 tools/update-meson.py
82-
./tools/test-git-no-uncommitted-changes
83-
continue-on-error: true
81+
if ! ./tools/test-git-no-uncommitted-changes; then
82+
git add --intent-to-add . # also show newly created files in git diff
83+
git status
84+
git diff
85+
false
86+
fi
8487
8588
- name: Verify dependencies
8689
shell: bash -l {0}
@@ -93,16 +96,6 @@ jobs:
9396
rm -R ./src/sage_setup/
9497
./sage -t --all -p4
9598
96-
- name: Show files changed by update-meson
97-
if: ${{ steps.check_update_meson.outcome == 'failure' }}
98-
shell: bash -l {0}
99-
# must be after "Test" since we still want to run test when check_update_meson fails
100-
run: |
101-
git add --intent-to-add . # also show newly created files in git diff
102-
git status
103-
git diff
104-
false
105-
10699
- name: Upload log
107100
uses: actions/[email protected]
108101
if: failure()

0 commit comments

Comments
 (0)