Skip to content

Commit ddbf08f

Browse files
authored
Merge pull request #8023 from radarhere/ubuntu
2 parents 9b13907 + 3686983 commit ddbf08f

File tree

3 files changed

+12
-9
lines changed

3 files changed

+12
-9
lines changed

.github/workflows/test-docker.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ jobs:
3636
docker: [
3737
# Run slower jobs first to give them a headstart and reduce waiting time
3838
ubuntu-22.04-jammy-arm64v8,
39-
ubuntu-22.04-jammy-ppc64le,
40-
ubuntu-22.04-jammy-s390x,
39+
ubuntu-24.04-noble-ppc64le,
40+
ubuntu-24.04-noble-s390x,
4141
# Then run the remainder
4242
alpine,
4343
amazon-2-amd64,
@@ -52,14 +52,15 @@ jobs:
5252
gentoo,
5353
ubuntu-20.04-focal-amd64,
5454
ubuntu-22.04-jammy-amd64,
55+
ubuntu-24.04-noble-amd64,
5556
]
5657
dockerTag: [main]
5758
include:
5859
- docker: "ubuntu-22.04-jammy-arm64v8"
5960
qemu-arch: "aarch64"
60-
- docker: "ubuntu-22.04-jammy-ppc64le"
61+
- docker: "ubuntu-24.04-noble-ppc64le"
6162
qemu-arch: "ppc64le"
62-
- docker: "ubuntu-22.04-jammy-s390x"
63+
- docker: "ubuntu-24.04-noble-s390x"
6364
qemu-arch: "s390x"
6465

6566
name: ${{ matrix.docker }}
@@ -81,8 +82,8 @@ jobs:
8182
8283
- name: Docker build
8384
run: |
84-
# The Pillow user in the docker container is UID 1000
85-
sudo chown -R 1000 $GITHUB_WORKSPACE
85+
# The Pillow user in the docker container is UID 1001
86+
sudo chown -R 1001 $GITHUB_WORKSPACE
8687
docker run --name pillow_container -v $GITHUB_WORKSPACE:/Pillow pythonpillow/${{ matrix.docker }}:${{ matrix.dockerTag }}
8788
sudo chown -R runner $GITHUB_WORKSPACE
8889

.github/workflows/test-valgrind.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
5151
- name: Build and Run Valgrind
5252
run: |
53-
# The Pillow user in the docker container is UID 1000
54-
sudo chown -R 1000 $GITHUB_WORKSPACE
53+
# The Pillow user in the docker container is UID 1001
54+
sudo chown -R 1001 $GITHUB_WORKSPACE
5555
docker run --name pillow_container -e "PILLOW_VALGRIND_TEST=true" -v $GITHUB_WORKSPACE:/Pillow pythonpillow/${{ matrix.docker }}:${{ matrix.dockerTag }}
5656
sudo chown -R runner $GITHUB_WORKSPACE

docs/installation/platform-support.rst

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,9 @@ These platforms are built and tested for every change.
4747
| Ubuntu Linux 22.04 LTS (Jammy) | 3.8, 3.9, 3.10, 3.11, | x86-64 |
4848
| | 3.12, 3.13, PyPy3 | |
4949
| +----------------------------+---------------------+
50-
| | 3.10 | arm64v8, ppc64le, |
50+
| | 3.10 | arm64v8 |
51+
+----------------------------------+----------------------------+---------------------+
52+
| Ubuntu Linux 24.04 LTS (Noble) | 3.12 | x86-64, ppc64le, |
5153
| | | s390x |
5254
+----------------------------------+----------------------------+---------------------+
5355
| Windows Server 2016 | 3.8 | x86-64 |

0 commit comments

Comments
 (0)