Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

make sagemath_categories-check, make pypi-wheels-check #36452

Merged
merged 13 commits into from
Oct 21, 2023
Merged

make sagemath_categories-check, make pypi-wheels-check #36452

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
18458bf
Rename spkg-piprm-requirements.txt to just spkg-requirements.txt
mkoeppe Oct 11, 2023
4a4810e
build/make/Makefile.in (SCRIPT_PACKAGE_templ): Set more variables set…
mkoeppe Oct 11, 2023
952405f
build/bin/sage-dist-helpers (sdh_store_[and_pip_install_]wheel): Reco…
mkoeppe Oct 11, 2023
f8b93c7
build/bin/sage-spkg: Remove unused code for packages without spkg-ins…
mkoeppe Oct 11, 2023
91b0b83
build/bin/sage-spkg: Adjust to spkg-requirements.txt being installed …
mkoeppe Oct 11, 2023
f91c20b
build/make/Makefile.in (SCRIPT_PACKAGE_templ): Remove script dir befo…
mkoeppe Oct 11, 2023
0aaf02e
build/make/Makefile.in (SCRIPT_PACKAGE_templ) [SAGE_CHECK=yes]: Call …
mkoeppe Oct 11, 2023
417de39
build/pkgs/sagemath_*/spkg-postinstcheck: Break out from spkg-install
mkoeppe Oct 11, 2023
3c2939a
Rename spkg-postinstcheck -> spkg-check
mkoeppe Oct 11, 2023
af6d0ad
build/pkgs/sage_sws2rst/spkg-install: Do not call spkg-check from her…
mkoeppe Oct 11, 2023
22b101f
build/make/Makefile.in (pypi-wheels-check): New target
mkoeppe Oct 12, 2023
3838613
.github/workflows/build.yml: Separate build and test
mkoeppe Oct 12, 2023
8224cb0
.github/workflows/build.yml: Fix 'if' of some steps
mkoeppe Oct 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 23 additions & 5 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,20 +107,19 @@ jobs:
(cd worktree-image && git commit -q -m "current changes" --allow-empty -a && git am; git reset --quiet old; git add -N .) < upstream/ci_fixes.patch
fi

- name: Incremental build, test changed files (sage -t --new)
- name: Incremental build
id: incremental
run: |
# Now re-bootstrap and build. The build is incremental because we were careful with the timestamps.
# We run tests with "sage -t --new"; this only tests the uncommitted changes.
./bootstrap && make build && ./sage -t --new -p2
./bootstrap && make build
working-directory: ./worktree-image
env:
MAKE: make -j2 --output-sync=recurse
SAGE_NUM_THREADS: 2

- name: Build and test modularized distributions
- name: Build modularized distributions
if: always() && steps.worktree.outcome == 'success'
run: make V=0 tox && make pypi-wheels
run: make V=0 tox && make SAGE_CHECK=no pypi-wheels
working-directory: ./worktree-image
env:
MAKE: make -j2 --output-sync=recurse
Expand Down Expand Up @@ -165,6 +164,25 @@ jobs:
MAKE: make -j2 --output-sync=recurse
SAGE_NUM_THREADS: 2

# Testing

- name: Test changed files (sage -t --new)
run: |
# We run tests with "sage -t --new"; this only tests the uncommitted changes.
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if: always() && steps.worktree.outcome == 'success'?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks, i've made a similar change in 8224cb0

./sage -t --new -p2
working-directory: ./worktree-image
env:
MAKE: make -j2 --output-sync=recurse
SAGE_NUM_THREADS: 2

- name: Test modularized distributions
if: always() && steps.worktree.outcome == 'success'
run: make V=0 tox && make pypi-wheels-check
working-directory: ./worktree-image
env:
MAKE: make -j2 --output-sync=recurse
SAGE_NUM_THREADS: 2

- name: Pytest
if: contains(github.ref, 'pytest')
run: |
Expand Down
Loading