Skip to content

Remove duplicate 'doc-html' target from CI #40357

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 6, 2025
Merged

Remove duplicate 'doc-html' target from CI #40357

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3dfebf1
Remove duplicate 'doc-html' target from CI
tobiasdiez Jul 1, 2025
43fa31e
Mark sagemath_doc_html as optional to not automatically build it
tobiasdiez Jul 1, 2025
89a90ba
Mark sagemath_doc_html type as optional
tobiasdiez Jul 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci-linux-incremental.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ jobs:
from_docker_target: "with-targets"
from_docker_tag: "dev"
docker_targets: "with-targets"
targets: "${{needs.changed_files.outputs.build_targets}} ci-build-with-fallback doc-html ptest-nodoc"
targets: "${{needs.changed_files.outputs.build_targets}} ci-build-with-fallback ptest-nodoc"
tox_system_factors: >-
["ubuntu-focal",
"ubuntu-jammy",
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/ci-linux.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ on:

env:
TARGETS_PRE: all-sage-local
TARGETS: build doc-html
TARGETS: build
TARGETS_OPTIONAL: ptest

permissions:
Expand All @@ -41,7 +41,7 @@ jobs:
docker_targets: "with-system-packages configured with-targets-pre with-targets with-targets-optional"
# FIXME: duplicated from env.TARGETS
targets_pre: all-sage-local
targets: build doc-html
targets: build
targets_optional: ptest
tox_system_factors: >-
["ubuntu-jammy"]
Expand All @@ -56,7 +56,7 @@ jobs:
# Build from scratch
docker_targets: "with-system-packages configured with-targets-pre with-targets with-targets-optional"
targets_pre: all-sage-local
targets: build doc-html
targets: build
targets_optional: ptest
tox_packages_factors: >-
["standard"]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-macos.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ on:

env:
TARGETS_PRE: all-sage-local
TARGETS: build doc-html
TARGETS: build
TARGETS_OPTIONAL: ptest

jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/macos.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ jobs:
case "${{ inputs.stage }}" in
1) export TARGETS_PRE="all-sage-local" TARGETS="all-sage-local" TARGETS_OPTIONAL="build/make/Makefile"
;;
2) export TARGETS_PRE="all-sage-local" TARGETS="build doc-html" TARGETS_OPTIONAL="ptest"
2) export TARGETS_PRE="all-sage-local" TARGETS="build" TARGETS_OPTIONAL="ptest"
;;
2-optional*) export TARGETS_PRE="build/make/Makefile" TARGETS="build/make/Makefile"
targets_pattern="${{ inputs.stage }}"
Expand Down
2 changes: 1 addition & 1 deletion build/pkgs/sagemath_doc_html/type
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
standard
optional
2 changes: 1 addition & 1 deletion src/sage/features/sagemath.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ def __init__(self):
filename='html',
search_path=(SAGE_DOC,),
spkg='sagemath_doc_html',
type='standard')
type='optional')


class sage__combinat(JoinFeature):
Expand Down
Loading