Skip to content

Commit 4260e44

Browse files
author
Release Manager
committed
gh-36473: CI docbuild: Do not rebuild sagelib from scratch <!-- ^^^^^ Please provide a concise, informative and self-explanatory title. Don't put issue numbers in there, do this in the PR body below. For example, instead of "Fixes #1234" use "Introduce new method to calculate 1+1" --> <!-- Describe your changes here in detail --> Reworking #35652 as discussed in #36469 (comment) Also applying the changes made in #35866 (cosmetic improvements to the Actions logs of doc-build.yml) to doc-build-pdf.yml <!-- 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. --> <!-- If your change requires a documentation PR, please link it appropriately --> <!-- If you're unsure about any of these, don't hesitate to ask. We're here to help! --> <!-- Feel free to remove irrelevant items. --> - [x] The title is concise, informative, and self-explanatory. - [ ] The description explains in detail what this PR is about. - [x] 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: #36473 Reported by: Matthias Köppe Reviewer(s): Kwankyu Lee, Matthias Köppe
2 parents ad4546c + fe5d8f2 commit 4260e44

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

.github/workflows/doc-build-pdf.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -89,27 +89,28 @@ jobs:
8989
./bootstrap && make build
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: Build (fallback to non-incremental)
9696
id: build
9797
if: always() && steps.worktree.outcome == 'success' && steps.incremental.outcome != 'success'
9898
run: |
9999
set -ex
100-
make doc-clean doc-uninstall sagelib-clean && git clean -fx src/sage && ./config.status && make build
100+
make sagelib-clean && git clean -fx src/sage && ./config.status && make build
101101
working-directory: ./worktree-image
102102
env:
103-
MAKE: make -j2
103+
MAKE: make -j2 --output-sync=recurse
104104
SAGE_NUM_THREADS: 2
105105

106106
- name: Build docs (PDF)
107107
id: docbuild
108108
if: always() && (steps.incremental.outcome == 'success' || steps.build.outcome == 'success')
109-
run: make build V=0 && make doc-pdf
109+
run: |
110+
make doc-clean doc-uninstall; make doc-pdf
110111
working-directory: ./worktree-image
111112
env:
112-
MAKE: make -j2
113+
MAKE: make -j2 --output-sync=recurse
113114
SAGE_NUM_THREADS: 2
114115

115116
- name: Copy docs

.github/workflows/doc-build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ jobs:
8888
if: always() && steps.worktree.outcome == 'success' && steps.incremental.outcome != 'success'
8989
run: |
9090
set -ex
91-
make doc-clean doc-uninstall sagelib-clean && git clean -fx src/sage && ./config.status && make build
91+
make sagelib-clean && git clean -fx src/sage && ./config.status && make build
9292
working-directory: ./worktree-image
9393
env:
9494
MAKE: make -j2 --output-sync=recurse
@@ -103,7 +103,7 @@ jobs:
103103
set -ex
104104
export SAGE_USE_CDNS=yes
105105
mv /sage/local/share/doc/sage/html/en/.git /sage/.git-doc
106-
make doc-clean doc-uninstall sagelib-clean && git clean -fx src/sage
106+
make doc-clean doc-uninstall
107107
mkdir -p /sage/local/share/doc/sage/html/en/ && mv /sage/.git-doc /sage/local/share/doc/sage/html/en/.git
108108
./config.status && make doc-html
109109
working-directory: ./worktree-image

0 commit comments

Comments
 (0)