Skip to content

Commit

Permalink
Test on CI that update-meson is properly ran
Browse files Browse the repository at this point in the history
  • Loading branch information
user202729 committed Feb 14, 2025
1 parent 92bc994 commit 82a439a
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 0 deletions.
25 changes: 25 additions & 0 deletions .github/workflows/ci-meson.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,23 @@ jobs:
# Use --no-deps and pip check below to verify that all necessary dependencies are installed via conda
pip install --no-build-isolation --no-deps --config-settings=builddir=builddir . -v
- name: Check update-meson
# this step must be after build, because meson.build creates a number of __init__.py files
# that is needed to make tools/update-meson.py run correctly
shell: bash -l {0}
id: check_update_meson
run: |
python3 tools/update-meson.py
make 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 status
git diff
- name: Verify dependencies
shell: bash -l {0}
run: pip check
Expand All @@ -83,6 +100,14 @@ jobs:
rm -R ./src/sage_setup/
./sage -t --all -p4
- name: Report update-meson failure
if: ${{ steps.check_update_meson.outcome == 'failure' }}
shell: bash -l {0}
run: |
# Please see step 'Show files changed by update-meson' above and apply the changes,
# or run tools/update-meson.py locally
false
- name: Upload log
uses: actions/[email protected]
if: failure()
Expand Down
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -467,3 +467,8 @@ src/sage/libs/mpfr/__init__.py
src/sage/libs/mpc/__init__.py
src/sage/calculus/transforms/__init__.py
src/sage/calculus/__init__.py

# Temporary files generated by Meson CI (needed to make test pass because
# ci-meson.yml runs a `make test-git-no-uncommitted-changes` step)
/.ccache
/setup-miniconda-patched-environment-*.yml

0 comments on commit 82a439a

Please sign in to comment.