mirror of
				https://github.com/python-pillow/Pillow.git
				synced 2025-10-31 16:07:30 +03:00 
			
		
		
		
	Merge branch 'main' into type_hints
This commit is contained in:
		
						commit
						8a56feea02
					
				
							
								
								
									
										13
									
								
								.github/workflows/test-docker.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										13
									
								
								.github/workflows/test-docker.yml
									
									
									
									
										vendored
									
									
								
							|  | @ -36,8 +36,8 @@ jobs: | |||
|         docker: [ | ||||
|           # Run slower jobs first to give them a headstart and reduce waiting time | ||||
|           ubuntu-22.04-jammy-arm64v8, | ||||
|           ubuntu-22.04-jammy-ppc64le, | ||||
|           ubuntu-22.04-jammy-s390x, | ||||
|           ubuntu-24.04-noble-ppc64le, | ||||
|           ubuntu-24.04-noble-s390x, | ||||
|           # Then run the remainder | ||||
|           alpine, | ||||
|           amazon-2-amd64, | ||||
|  | @ -52,14 +52,15 @@ jobs: | |||
|           gentoo, | ||||
|           ubuntu-20.04-focal-amd64, | ||||
|           ubuntu-22.04-jammy-amd64, | ||||
|           ubuntu-24.04-noble-amd64, | ||||
|         ] | ||||
|         dockerTag: [main] | ||||
|         include: | ||||
|           - docker: "ubuntu-22.04-jammy-arm64v8" | ||||
|             qemu-arch: "aarch64" | ||||
|           - docker: "ubuntu-22.04-jammy-ppc64le" | ||||
|           - docker: "ubuntu-24.04-noble-ppc64le" | ||||
|             qemu-arch: "ppc64le" | ||||
|           - docker: "ubuntu-22.04-jammy-s390x" | ||||
|           - docker: "ubuntu-24.04-noble-s390x" | ||||
|             qemu-arch: "s390x" | ||||
| 
 | ||||
|     name: ${{ matrix.docker }} | ||||
|  | @ -81,8 +82,8 @@ jobs: | |||
| 
 | ||||
|     - name: Docker build | ||||
|       run: | | ||||
|         # The Pillow user in the docker container is UID 1000 | ||||
|         sudo chown -R 1000 $GITHUB_WORKSPACE | ||||
|         # The Pillow user in the docker container is UID 1001 | ||||
|         sudo chown -R 1001 $GITHUB_WORKSPACE | ||||
|         docker run --name pillow_container  -v $GITHUB_WORKSPACE:/Pillow pythonpillow/${{ matrix.docker }}:${{ matrix.dockerTag }} | ||||
|         sudo chown -R runner $GITHUB_WORKSPACE | ||||
| 
 | ||||
|  |  | |||
							
								
								
									
										4
									
								
								.github/workflows/test-valgrind.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								.github/workflows/test-valgrind.yml
									
									
									
									
										vendored
									
									
								
							|  | @ -50,7 +50,7 @@ jobs: | |||
| 
 | ||||
|     - name: Build and Run Valgrind | ||||
|       run: | | ||||
|         # The Pillow user in the docker container is UID 1000 | ||||
|         sudo chown -R 1000 $GITHUB_WORKSPACE | ||||
|         # The Pillow user in the docker container is UID 1001 | ||||
|         sudo chown -R 1001 $GITHUB_WORKSPACE | ||||
|         docker run --name pillow_container -e "PILLOW_VALGRIND_TEST=true" -v $GITHUB_WORKSPACE:/Pillow pythonpillow/${{ matrix.docker }}:${{ matrix.dockerTag }} | ||||
|         sudo chown -R runner $GITHUB_WORKSPACE | ||||
|  |  | |||
|  | @ -47,7 +47,9 @@ These platforms are built and tested for every change. | |||
| | Ubuntu Linux 22.04 LTS (Jammy)   | 3.8, 3.9, 3.10, 3.11,      | x86-64              | | ||||
| |                                  | 3.12, 3.13, PyPy3          |                     | | ||||
| |                                  +----------------------------+---------------------+ | ||||
| |                                  | 3.10                       | arm64v8, ppc64le,   | | ||||
| |                                  | 3.10                       | arm64v8             | | ||||
| +----------------------------------+----------------------------+---------------------+ | ||||
| | Ubuntu Linux 24.04 LTS (Noble)   | 3.12                       | x86-64, ppc64le,    | | ||||
| |                                  |                            | s390x               | | ||||
| +----------------------------------+----------------------------+---------------------+ | ||||
| | Windows Server 2016              | 3.8                        | x86-64              | | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue
	
	Block a user