Skip to content

Commit 25fc6f0

Browse files
author
Release Manager
committed
gh-40357: Remove duplicate 'doc-html' target from CI
<!-- ^ Please provide a concise and informative title. --> <!-- ^ Don't put issue numbers in the title, do this in the PR description below. --> <!-- ^ For example, instead of "Fixes #12345" use "Introduce new method to calculate 1 + 2". --> <!-- v Describe your changes below in detail. --> <!-- v Why is this change required? What problem does it solve? --> <!-- v If this PR resolves an open issue, please link to it here. For example, "Fixes #12345". --> Docbuilding is done in a seperate CI workflow, so there is no need to also build the docs as part of the normal CI runs. ### 📝 Checklist <!-- Put an `x` in all the boxes that apply. --> - [ ] The title is concise and informative. - [ ] 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 and checked the documentation preview. ### ⌛ Dependencies <!-- List all open PRs that this PR logically depends on. For example, --> <!-- - #12345: short description why this is a dependency --> <!-- - #34567: ... --> URL: #40357 Reported by: Tobias Diez Reviewer(s): Dima Pasechnik
2 parents 34e96ca + 89a90ba commit 25fc6f0

File tree

8 files changed

+11
-11
lines changed

8 files changed

+11
-11
lines changed

.github/workflows/ci-linux-incremental.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ jobs:
9494
from_docker_target: "with-targets"
9595
from_docker_tag: "dev"
9696
docker_targets: "with-targets"
97-
targets: "${{needs.changed_files.outputs.build_targets}} ci-build-with-fallback doc-html ptest-nodoc"
97+
targets: "${{needs.changed_files.outputs.build_targets}} ci-build-with-fallback ptest-nodoc"
9898
tox_system_factors: >-
9999
["ubuntu-focal",
100100
"ubuntu-jammy",

.github/workflows/ci-linux.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ on:
2525

2626
env:
2727
TARGETS_PRE: all-sage-local
28-
TARGETS: build doc-html
28+
TARGETS: build
2929
TARGETS_OPTIONAL: ptest
3030

3131
permissions:
@@ -41,7 +41,7 @@ jobs:
4141
docker_targets: "with-system-packages configured with-targets-pre with-targets with-targets-optional"
4242
# FIXME: duplicated from env.TARGETS
4343
targets_pre: all-sage-local
44-
targets: build doc-html
44+
targets: build
4545
targets_optional: ptest
4646
tox_system_factors: >-
4747
["ubuntu-jammy"]
@@ -56,7 +56,7 @@ jobs:
5656
# Build from scratch
5757
docker_targets: "with-system-packages configured with-targets-pre with-targets with-targets-optional"
5858
targets_pre: all-sage-local
59-
targets: build doc-html
59+
targets: build
6060
targets_optional: ptest
6161
tox_packages_factors: >-
6262
["standard"]

.github/workflows/ci-macos.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ on:
3030

3131
env:
3232
TARGETS_PRE: all-sage-local
33-
TARGETS: build doc-html
33+
TARGETS: build
3434
TARGETS_OPTIONAL: ptest
3535

3636
jobs:

.github/workflows/macos.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ jobs:
120120
case "${{ inputs.stage }}" in
121121
1) export TARGETS_PRE="all-sage-local" TARGETS="all-sage-local" TARGETS_OPTIONAL="build/make/Makefile"
122122
;;
123-
2) export TARGETS_PRE="all-sage-local" TARGETS="build doc-html" TARGETS_OPTIONAL="ptest"
123+
2) export TARGETS_PRE="all-sage-local" TARGETS="build" TARGETS_OPTIONAL="ptest"
124124
;;
125125
2-optional*) export TARGETS_PRE="build/make/Makefile" TARGETS="build/make/Makefile"
126126
targets_pattern="${{ inputs.stage }}"

build/pkgs/configure/checksums.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
tarball=configure-VERSION.tar.gz
2-
sha1=6e97cc1d4210d590ba03a114613a25328328f40c
3-
sha256=61bdb343e63dbf24da20cf306507cce5adaff3d404f6fc80279dace9df069cca
2+
sha1=a2f325ab55e6a66a77ec31b9a8f0f435a69ca8a1
3+
sha256=15aaa3e908cebf425da8b25d0a2a310a4be31b7ea69e602f9a71ae60c7efa93c
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
e477b348021ad12bb8348446a3dff0c58fe82722
1+
5d99cf91ebe913ad527f3953bb94c7e04d1a05fe

build/pkgs/sagemath_doc_html/type

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
standard
1+
optional

src/sage/features/sagemath.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ def __init__(self):
101101
filename='html',
102102
search_path=(SAGE_DOC,),
103103
spkg='sagemath_doc_html',
104-
type='standard')
104+
type='optional')
105105

106106

107107
class sage__combinat(JoinFeature):

0 commit comments

Comments
 (0)