Skip to content

Commit 82a439a

Browse files
committed
Test on CI that update-meson is properly ran
1 parent 92bc994 commit 82a439a

File tree

2 files changed

+30
-0
lines changed

2 files changed

+30
-0
lines changed

.github/workflows/ci-meson.yml

+25
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,23 @@ jobs:
7272
# Use --no-deps and pip check below to verify that all necessary dependencies are installed via conda
7373
pip install --no-build-isolation --no-deps --config-settings=builddir=builddir . -v
7474
75+
- name: Check update-meson
76+
# this step must be after build, because meson.build creates a number of __init__.py files
77+
# that is needed to make tools/update-meson.py run correctly
78+
shell: bash -l {0}
79+
id: check_update_meson
80+
run: |
81+
python3 tools/update-meson.py
82+
make test-git-no-uncommitted-changes
83+
continue-on-error: true
84+
85+
- name: Show files changed by update-meson
86+
if: ${{ steps.check_update_meson.outcome == 'failure' }}
87+
shell: bash -l {0}
88+
run: |
89+
git status
90+
git diff
91+
7592
- name: Verify dependencies
7693
shell: bash -l {0}
7794
run: pip check
@@ -83,6 +100,14 @@ jobs:
83100
rm -R ./src/sage_setup/
84101
./sage -t --all -p4
85102
103+
- name: Report update-meson failure
104+
if: ${{ steps.check_update_meson.outcome == 'failure' }}
105+
shell: bash -l {0}
106+
run: |
107+
# Please see step 'Show files changed by update-meson' above and apply the changes,
108+
# or run tools/update-meson.py locally
109+
false
110+
86111
- name: Upload log
87112
uses: actions/[email protected]
88113
if: failure()

.gitignore

+5
Original file line numberDiff line numberDiff line change
@@ -467,3 +467,8 @@ src/sage/libs/mpfr/__init__.py
467467
src/sage/libs/mpc/__init__.py
468468
src/sage/calculus/transforms/__init__.py
469469
src/sage/calculus/__init__.py
470+
471+
# Temporary files generated by Meson CI (needed to make test pass because
472+
# ci-meson.yml runs a `make test-git-no-uncommitted-changes` step)
473+
/.ccache
474+
/setup-miniconda-patched-environment-*.yml

0 commit comments

Comments
 (0)