Skip to content

Commit d129264

Browse files
committed
Use 'standard' instead of 'maximal' as package factor
'maximal' also installs optional packages as system packages; this is better handled via the 'optional' factor.
1 parent 49d2fb1 commit d129264

File tree

6 files changed

+16
-16
lines changed

6 files changed

+16
-16
lines changed

.github/workflows/build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ on:
1515
platform:
1616
description: 'Platform'
1717
required: true
18-
default: 'ubuntu-noble-maximal'
18+
default: 'ubuntu-noble-standard'
1919
docker_tag:
2020
description: 'Docker tag'
2121
required: true
@@ -68,8 +68,8 @@ concurrency:
6868

6969
env:
7070
# Adapted from docker.yml
71-
TOX_ENV: "docker-${{ github.event.inputs.platform || 'ubuntu-noble-maximal' }}-incremental"
72-
BUILD_IMAGE: "localhost:5000/${{ github.repository }}/sage-${{ github.event.inputs.platform || 'ubuntu-noble-maximal' }}-with-targets:ci"
71+
TOX_ENV: "docker-${{ github.event.inputs.platform || 'ubuntu-noble-standard' }}-incremental"
72+
BUILD_IMAGE: "localhost:5000/${{ github.repository }}/sage-${{ github.event.inputs.platform || 'ubuntu-noble-standard' }}-with-targets:ci"
7373
FROM_DOCKER_REPOSITORY: "ghcr.io/sagemath/sage/"
7474
FROM_DOCKER_TARGET: "with-targets"
7575
FROM_DOCKER_TAG: ${{ github.event.inputs.docker_tag || 'dev'}}

.github/workflows/ci-linux.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
["minimal"]
5050
docker_push_repository: ghcr.io/${{ github.repository }}/
5151

52-
maximal:
52+
standard:
5353
uses: ./.github/workflows/docker.yml
5454
with:
5555
free_disk_space: true
@@ -59,5 +59,5 @@ jobs:
5959
targets: build doc-html
6060
targets_optional: ptest
6161
tox_packages_factors: >-
62-
["maximal"]
62+
["standard"]
6363
docker_push_repository: ghcr.io/${{ github.repository }}/

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
platform:
1010
description: 'Platform'
1111
required: true
12-
default: 'ubuntu-noble-maximal'
12+
default: 'ubuntu-noble-standard'
1313
docker_tag:
1414
description: 'Docker tag'
1515
required: true
@@ -22,8 +22,8 @@ concurrency:
2222

2323
env:
2424
# Same as in build.yml
25-
TOX_ENV: "docker-${{ github.event.inputs.platform || 'ubuntu-noble-maximal' }}-incremental"
26-
BUILD_IMAGE: "localhost:5000/${{ github.repository }}/sage-${{ github.event.inputs.platform || 'ubuntu-noble-maximal' }}-with-targets:ci"
25+
TOX_ENV: "docker-${{ github.event.inputs.platform || 'ubuntu-noble-standard' }}-incremental"
26+
BUILD_IMAGE: "localhost:5000/${{ github.repository }}/sage-${{ github.event.inputs.platform || 'ubuntu-noble-standard' }}-with-targets:ci"
2727
FROM_DOCKER_REPOSITORY: "ghcr.io/sagemath/sage/"
2828
FROM_DOCKER_TARGET: "with-targets"
2929
FROM_DOCKER_TAG: ${{ github.event.inputs.docker_tag || 'dev'}}

.github/workflows/pyright.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ concurrency:
1818
jobs:
1919
pyright:
2020
runs-on: ubuntu-latest
21-
container: ghcr.io/sagemath/sage/sage-ubuntu-noble-maximal-with-targets:dev
21+
container: ghcr.io/sagemath/sage/sage-ubuntu-noble-standard-with-targets:dev
2222
steps:
2323
- name: Checkout
2424
id: checkout

src/doc/en/developer/github.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -462,7 +462,7 @@ Actions.
462462
test. Details are again available by clicking on the check.
463463

464464
The automatic workflow runs on a container based on
465-
``ubuntu-jammy-maximal``. To request a run of the workflow on a different
465+
``ubuntu``. To request a run of the workflow on a different
466466
platform, you can issue a `workflow dispatch
467467
<https://docs.github.com/en/actions/managing-workflow-runs/manually-running-a-workflow#running-a-workflow>`_.
468468
You can select any of the platforms for which a `prebuilt container image

src/doc/en/developer/portability_testing.rst

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1144,20 +1144,20 @@ deployment.
11441144

11451145
The image version corresponding to the latest development release
11461146
receives the additional Docker tag ``dev``, see for example the Docker
1147-
image for the platform `ubuntu-focal-maximal
1148-
<https://github.com/sagemath/sage/pkgs/container/sage%2Fsage-ubuntu-focal-maximal-with-targets-optional>`_. Thus,
1147+
image for the platform `ubuntu-focal-standard
1148+
<https://github.com/sagemath/sage/pkgs/container/sage%2Fsage-ubuntu-focal-standard-with-targets-optional>`_. Thus,
11491149
for example, the following command will work::
11501150

1151-
$ docker run -it ghcr.io/sagemath/sage/sage-ubuntu-focal-maximal-with-targets-optional:dev bash
1152-
Unable to find image 'ghcr.io/sagemath/sage/sage-ubuntu-focal-maximal-with-targets-optional:dev' locally
1153-
dev: Pulling from sagemath/sage/sage-ubuntu-focal-maximal-with-targets-optional
1151+
$ docker run -it ghcr.io/sagemath/sage/sage-ubuntu-focal-standard-with-targets-optional:dev bash
1152+
Unable to find image 'ghcr.io/sagemath/sage/sage-ubuntu-focal-standard-with-targets-optional:dev' locally
1153+
dev: Pulling from sagemath/sage/sage-ubuntu-focal-standard-with-targets-optional
11541154
d5fd17ec1767: Already exists
11551155
67586203f0c7: Pull complete
11561156
b63c529f4777: Pull complete
11571157
...
11581158
159775d1a3d2: Pull complete
11591159
Digest: sha256:e6ba5e12f59c6c4668692ef4cfe4ae5f242556482664fb347bf260f32bf8e698
1160-
Status: Downloaded newer image for ghcr.io/sagemath/sage/sage-ubuntu-focal-maximal-with-targets-optional:dev
1160+
Status: Downloaded newer image for ghcr.io/sagemath/sage/sage-ubuntu-focal-standard-with-targets-optional:dev
11611161
root@8055a7ba0607:/sage# ./sage
11621162
┌────────────────────────────────────────────────────────────────────┐
11631163
│ SageMath version 9.6, Release Date: 2022-05-15 │

0 commit comments

Comments
 (0)