CI Build & Test: First build incrementally and test changed files only #35652
.github/workflows/build.yml: Also do the main test in worktree-image
- Loading branch information
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -66,49 +66,55 @@ jobs: | |||||
| if [ ! -f worktree-image/.gitignore ]; then cp .gitignore worktree-image/; fi | ||||||
| (cd worktree-image && git add -A && git commit --allow-empty -m "old" -a && git tag -f old && git reset --hard new && git reset old) | ||||||
|
|
||||||
| - name: Incremental build and test --new | ||||||
| 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 | ||||||
| working-directory: ./worktree-image | ||||||
| env: | ||||||
| MAKE: make -j2 | ||||||
| SAGE_NUM_THREADS: 2 | ||||||
|
|
||||||
| - name: Configure new tree | ||||||
| if: always() && steps.worktree.outcome == 'success' | ||||||
| run: | | ||||||
| # Reuse built SAGE_LOCAL contained in the Docker image | ||||||
| ./bootstrap | ||||||
| ./configure --enable-build-as-root --prefix=/sage/local --with-sage-venv --enable-editable --enable-download-from-upstream-url | ||||||
|
|
||||||
| - name: Build and test modularized distributions | ||||||
| if: always() && steps.worktree.outcome == 'success' | ||||||
| run: make V=0 tox && make pypi-wheels | ||||||
| working-directory: ./worktree-image | ||||||
| env: | ||||||
| MAKE: make -j2 | ||||||
| SAGE_NUM_THREADS: 2 | ||||||
|
|
||||||
| - name: Set up node to install pyright | ||||||
| if: always() && steps.worktree.outcome == 'success' | ||||||
| uses: actions/setup-node@v3 | ||||||
| with: | ||||||
| node-version: '12' | ||||||
|
|
||||||
| - name: Install pyright | ||||||
| if: always() && steps.worktree.outcome == 'success' | ||||||
| # Fix to v232 due to bug https://github.com/microsoft/pyright/issues/3239 | ||||||
| run: npm install -g [email protected] | ||||||
|
|
||||||
| - name: Static code check with pyright | ||||||
| if: always() && steps.worktree.outcome == 'success' | ||||||
| run: pyright | ||||||
| working-directory: ./worktree-image | ||||||
|
|
||||||
| - name: Build (fallback to non-incremental) | ||||||
| id: build | ||||||
| if: always() && steps.worktree.outcome == 'success' && steps.incremental.outcome != 'success' | ||||||
| run: | | ||||||
| set -ex | ||||||
| ./bootstrap && make doc-clean doc-uninstall sagelib-clean && git clean -fx src/sage && ./config.status && make build | ||||||
| working-directory: ./worktree-image | ||||||
| env: | ||||||
| MAKE: make -j2 | ||||||
| SAGE_NUM_THREADS: 2 | ||||||
|
|
@@ -118,27 +124,28 @@ jobs: | |||||
| run: | | ||||||
| ../sage -python -m pip install coverage pytest-xdist | ||||||
| ../sage -python -m coverage run -m pytest -c tox.ini --doctest-modules || true | ||||||
| working-directory: ./worktree-image/src | ||||||
| env: | ||||||
| # Increase the length of the lines in the "short summary" | ||||||
| COLUMNS: 120 | ||||||
|
|
||||||
| - name: Test --all --long | ||||||
|
||||||
| - name: Test --all --long | |
| - name: Run all tests |
Contributor
Author
There was a problem hiding this comment.
Not sure what is better. "all" is not clear enough because in our terminology it does not include the long tests. I used the flags to be precise
How about "Run 'sage -t --all --long'"
Collaborator
There was a problem hiding this comment.
How about Test all files (--all --long)?
Contributor
Author
There was a problem hiding this comment.
I've committed something along these lines in 908ad71
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
How about
test changed files (--new)?