Skip to content

Commit 1a3eff9

Browse files
committed
Merge branch 'main' into has_characters
2 parents cd21afb + b62ff96 commit 1a3eff9

File tree

91 files changed

+1123
-656
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+1123
-656
lines changed

.ci/install.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ pushd depends && ./install_imagequant.sh && popd
5353
pushd depends && sudo ./install_raqm.sh && popd
5454

5555
# libavif
56-
pushd depends && sudo ./install_libavif.sh && popd
56+
pushd depends && ./install_libavif.sh && popd
5757

5858
# extra test images
5959
pushd depends && ./install_extra_test_images.sh && popd

.github/workflows/cifuzz.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@ concurrency:
2424
group: ${{ github.workflow }}-${{ github.ref }}
2525
cancel-in-progress: true
2626

27+
env:
28+
FORCE_COLOR: 1
29+
2730
jobs:
2831
Fuzzing:
2932
runs-on: ubuntu-latest

.github/workflows/docs.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,19 +48,35 @@ jobs:
4848
- name: Build system information
4949
run: python3 .github/workflows/system-info.py
5050

51+
- name: Cache libavif
52+
uses: actions/cache@v5
53+
id: cache-libavif
54+
with:
55+
path: ~/cache-libavif
56+
key: ${{ runner.os }}-libavif-${{ hashFiles('depends/install_libavif.sh', 'depends/libavif-svt4.patch') }}
57+
5158
- name: Cache libimagequant
5259
uses: actions/cache@v5
5360
id: cache-libimagequant
5461
with:
5562
path: ~/cache-libimagequant
5663
key: ${{ runner.os }}-libimagequant-${{ hashFiles('depends/install_imagequant.sh') }}
5764

65+
- name: Cache libwebp
66+
uses: actions/cache@v5
67+
id: cache-libwebp
68+
with:
69+
path: ~/cache-libwebp
70+
key: ${{ runner.os }}-libwebp-${{ hashFiles('depends/install_webp.sh') }}
71+
5872
- name: Install Linux dependencies
5973
run: |
6074
.ci/install.sh
6175
env:
6276
GHA_PYTHON_VERSION: "3.x"
77+
GHA_LIBAVIF_CACHE_HIT: ${{ steps.cache-libavif.outputs.cache-hit }}
6378
GHA_LIBIMAGEQUANT_CACHE_HIT: ${{ steps.cache-libimagequant.outputs.cache-hit }}
79+
GHA_LIBWEBP_CACHE_HIT: ${{ steps.cache-libwebp.outputs.cache-hit }}
6480

6581
- name: Build
6682
run: |

.github/workflows/release-drafter.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@ concurrency:
1414
group: ${{ github.workflow }}-${{ github.ref }}
1515
cancel-in-progress: true
1616

17+
env:
18+
FORCE_COLOR: 1
19+
1720
jobs:
1821
update_release_draft:
1922
permissions:

.github/workflows/stale.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ concurrency:
1212
group: ${{ github.workflow }}-${{ github.ref }}
1313
cancel-in-progress: true
1414

15+
env:
16+
FORCE_COLOR: 1
17+
1518
jobs:
1619
stale:
1720
if: github.repository_owner == 'python-pillow'

.github/workflows/test-docker.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@ concurrency:
2626
group: ${{ github.workflow }}-${{ github.ref }}
2727
cancel-in-progress: true
2828

29+
env:
30+
FORCE_COLOR: 1
31+
2932
jobs:
3033
build:
3134

@@ -83,7 +86,7 @@ jobs:
8386

8487
- name: Docker pull
8588
run: |
86-
docker pull pythonpillow/${{ matrix.docker }}:${{ matrix.dockerTag }}
89+
docker pull ${{ matrix.qemu-arch && format('--platform=linux/{0}', matrix.qemu-arch)}} pythonpillow/${{ matrix.docker }}:${{ matrix.dockerTag }}
8790
8891
- name: Docker build
8992
run: |

.github/workflows/test-mingw.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ concurrency:
2828

2929
env:
3030
COVERAGE_CORE: sysmon
31+
FORCE_COLOR: 1
3132

3233
jobs:
3334
build:

.github/workflows/test-valgrind-memory.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@ concurrency:
2626
group: ${{ github.workflow }}-${{ github.ref }}
2727
cancel-in-progress: true
2828

29+
env:
30+
FORCE_COLOR: 1
31+
2932
jobs:
3033
build:
3134

.github/workflows/test-valgrind.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@ concurrency:
2424
group: ${{ github.workflow }}-${{ github.ref }}
2525
cancel-in-progress: true
2626

27+
env:
28+
FORCE_COLOR: 1
29+
2730
jobs:
2831
build:
2932

.github/workflows/test-windows.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ concurrency:
2828

2929
env:
3030
COVERAGE_CORE: sysmon
31+
FORCE_COLOR: 1
3132

3233
jobs:
3334
build:
@@ -98,8 +99,8 @@ jobs:
9899
choco install nasm --no-progress
99100
echo "C:\Program Files\NASM" >> $env:GITHUB_PATH
100101
101-
choco install ghostscript --version=10.6.0 --no-progress
102-
echo "C:\Program Files\gs\gs10.06.0\bin" >> $env:GITHUB_PATH
102+
choco install ghostscript --version=10.7.0 --no-progress
103+
echo "C:\Program Files\gs\gs10.07.0\bin" >> $env:GITHUB_PATH
103104
104105
# Install extra test images
105106
xcopy /S /Y Tests\test-images\* Tests\images

0 commit comments

Comments
 (0)