Skip to content

Commit fe5d8f2

Browse files
author
Matthias Koeppe
committed
CI docbuild: Do not rebuild sagelib from scratch
1 parent b7c1c8f commit fe5d8f2

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
@@ -110,27 +110,28 @@ jobs:
110110
./bootstrap && make build
111111
working-directory: ./worktree-image
112112
env:
113-
MAKE: make -j2
113+
MAKE: make -j2 --output-sync=recurse
114114
SAGE_NUM_THREADS: 2
115115

116116
- name: Build (fallback to non-incremental)
117117
id: build
118118
if: always() && steps.worktree.outcome == 'success' && steps.incremental.outcome != 'success'
119119
run: |
120120
set -ex
121-
make doc-clean doc-uninstall sagelib-clean && git clean -fx src/sage && ./config.status && make build
121+
make sagelib-clean && git clean -fx src/sage && ./config.status && make build
122122
working-directory: ./worktree-image
123123
env:
124-
MAKE: make -j2
124+
MAKE: make -j2 --output-sync=recurse
125125
SAGE_NUM_THREADS: 2
126126

127127
- name: Build docs (PDF)
128128
id: docbuild
129129
if: always() && (steps.incremental.outcome == 'success' || steps.build.outcome == 'success')
130-
run: make build V=0 && make doc-pdf
130+
run: |
131+
make doc-clean doc-uninstall; make doc-pdf
131132
working-directory: ./worktree-image
132133
env:
133-
MAKE: make -j2
134+
MAKE: make -j2 --output-sync=recurse
134135
SAGE_NUM_THREADS: 2
135136

136137
- name: Copy docs

.github/workflows/doc-build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ jobs:
109109
if: always() && steps.worktree.outcome == 'success' && steps.incremental.outcome != 'success'
110110
run: |
111111
set -ex
112-
make doc-clean doc-uninstall sagelib-clean && git clean -fx src/sage && ./config.status && make build
112+
make sagelib-clean && git clean -fx src/sage && ./config.status && make build
113113
working-directory: ./worktree-image
114114
env:
115115
MAKE: make -j2 --output-sync=recurse
@@ -124,7 +124,7 @@ jobs:
124124
set -ex
125125
export SAGE_USE_CDNS=yes
126126
mv /sage/local/share/doc/sage/html/en/.git /sage/.git-doc
127-
make doc-clean doc-uninstall sagelib-clean && git clean -fx src/sage
127+
make doc-clean doc-uninstall
128128
mkdir -p /sage/local/share/doc/sage/html/en/ && mv /sage/.git-doc /sage/local/share/doc/sage/html/en/.git
129129
./config.status && make doc-html
130130
working-directory: ./worktree-image

0 commit comments

Comments
 (0)