Skip to content

Commit 5cef467

Browse files
author
Release Manager
committed
gh-35866: CI build.yml, doc-build.yml: Use output groups <!-- Please provide a concise, informative and self-explanatory title. --> <!-- Don't put issue numbers in the title. Put it in the Description below. --> <!-- For example, instead of "Fixes #12345", use "Add a new method to multiply two integers" --> ### 📚 Description <!-- Describe your changes here in detail. --> With this change, the output of each spkg build is put in foldable output groups. The output synchronization is not perfect, but it's still much better than before. <!-- Why is this change required? What problem does it solve? --> <!-- If this PR resolves an open issue, please link to it here. For example "Fixes #12345". --> <!-- If your change requires a documentation PR, please link it appropriately. --> ### 📝 Checklist <!-- Put an `x` in all the boxes that apply. It should be `[x]` not `[x ]`. --> - [x] The title is concise, informative, and self-explanatory. - [x] The description explains in detail what this PR is about. - [ ] I have linked a relevant issue or discussion. - [ ] I have created tests covering the changes. - [ ] I have updated the documentation accordingly. ### ⌛ Dependencies <!-- List all open PRs that this PR logically depends on - #12345: short description why this is a dependency - #34567: ... --> <!-- If you're unsure about any of these, don't hesitate to ask. We're here to help! --> URL: #35866 Reported by: Matthias Köppe Reviewer(s): Kwankyu Lee, Matthias Köppe, Tobias Diez
2 parents 2829cf2 + fd6b030 commit 5cef467

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

.github/workflows/build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,15 +76,15 @@ jobs:
7676
./bootstrap && make build && ./sage -t --new -p2
7777
working-directory: ./worktree-image
7878
env:
79-
MAKE: make -j2
79+
MAKE: make -j2 --output-sync=recurse
8080
SAGE_NUM_THREADS: 2
8181

8282
- name: Build and test modularized distributions
8383
if: always() && steps.worktree.outcome == 'success'
8484
run: make V=0 tox && make pypi-wheels
8585
working-directory: ./worktree-image
8686
env:
87-
MAKE: make -j2
87+
MAKE: make -j2 --output-sync=recurse
8888
SAGE_NUM_THREADS: 2
8989

9090
- name: Set up node to install pyright
@@ -123,7 +123,7 @@ jobs:
123123
make build
124124
working-directory: ./worktree-image
125125
env:
126-
MAKE: make -j2
126+
MAKE: make -j2 --output-sync=recurse
127127
SAGE_NUM_THREADS: 2
128128

129129
- name: Pytest

.github/workflows/doc-build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ jobs:
6161
./bootstrap && make build
6262
working-directory: ./worktree-image
6363
env:
64-
MAKE: make -j2
64+
MAKE: make -j2 --output-sync=recurse
6565
SAGE_NUM_THREADS: 2
6666

6767
- name: Build (fallback to non-incremental)
@@ -72,7 +72,7 @@ jobs:
7272
make doc-clean doc-uninstall sagelib-clean && git clean -fx src/sage && ./config.status && make build
7373
working-directory: ./worktree-image
7474
env:
75-
MAKE: make -j2
75+
MAKE: make -j2 --output-sync=recurse
7676
SAGE_NUM_THREADS: 2
7777

7878
- name: Build docs
@@ -89,7 +89,7 @@ jobs:
8989
./config.status && make doc-html
9090
working-directory: ./worktree-image
9191
env:
92-
MAKE: make -j2
92+
MAKE: make -j2 --output-sync=recurse
9393
SAGE_NUM_THREADS: 2
9494

9595
- name: Copy docs

build/bin/sage-logger

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,9 @@ else
8989
# Redirect stdout and stderr to a subprocess running tee.
9090
# We trap SIGINT such that SIGINT interrupts the main process being
9191
# run, not the logging.
92+
9293
( exec 2>&1; eval "$cmd" ) | \
93-
( trap '' SIGINT; tee -a "$logfile" | $SED )
94+
( trap '' SIGINT; if [ -n "$GITHUB_ACTIONS" -a -n "$prefix" ]; then echo "::group::${logname}"; fi; tee -a "$logfile" | $SED; if [ -n "$GITHUB_ACTIONS" -a -n "$prefix" ]; then echo "::endgroup::"; fi )
9495

9596
pipestatus=(${PIPESTATUS[*]})
9697

0 commit comments

Comments
 (0)