Merge branch 'tutorial-assets-webp' of https://github.com/damusss/pygame-ce into tutorial-assets-webp

Author: damusss

.github/workflows/build-debian-multiarch.yml

@@ -68,7 +68,7 @@ jobs:
     - uses: actions/checkout@v4.2.2
 
     - name: Build sources and run tests
-      uses: uraimo/run-on-arch-action@v2.8.1
+      uses: uraimo/run-on-arch-action@v3.0.0
       id: build
       with:
         arch: ${{ matrix.base_image && 'none' || matrix.arch }}
@@ -134,7 +134,7 @@ jobs:
         done
 
     - name: Test armv7 wheel on armv6
-      uses: uraimo/run-on-arch-action@v2.8.1
+      uses: uraimo/run-on-arch-action@v3.0.0
       with:
         arch: armv6
         distro: bookworm

.github/workflows/build-macos.yml

@@ -51,7 +51,7 @@ jobs:
 
       - name: Test for Mac Deps cache hit
         id: macdep-cache
-        uses: actions/cache@v4.2.1
+        uses: actions/cache@v4.2.2
         with:
           path: ${{ github.workspace }}/pygame_mac_deps_${{ matrix.macarch }}
           # The hash of all files in buildconfig manylinux-build and macdependencies is
@@ -118,14 +118,14 @@ jobs:
       - uses: actions/checkout@v4.2.2
 
       - name: pip cache
-        uses: actions/cache@v4.2.1
+        uses: actions/cache@v4.2.2
         with:
           path: ~/Library/Caches/pip  # This cache path is only right on mac
           key: pip-cache-${{ matrix.macarch }}-${{ matrix.os }}
 
       - name: Fetch Mac deps
         id: macdep-cache
-        uses: actions/cache@v4.2.1
+        uses: actions/cache@v4.2.2
         with:
           path: ${{ github.workspace }}/pygame_mac_deps_${{ matrix.macarch }}
           key: macdep-${{ hashFiles('buildconfig/manylinux-build/**') }}-${{ hashFiles('buildconfig/macdependencies/*.sh') }}-${{ matrix.macarch }}
@@ -137,7 +137,7 @@ jobs:
           version: "0.5.26"
 
       - name: Build and test wheels
-        uses: pypa/cibuildwheel@v2.22.0
+        uses: pypa/cibuildwheel@v2.23.0
 
       - uses: actions/upload-artifact@v4
         with:

.github/workflows/build-manylinux.yml

@@ -68,14 +68,14 @@ jobs:
 
     - name: Extract metadata (tags, labels) for Docker
       id: meta
-      uses: docker/metadata-action@369eb591f429131d6889c46b94e711f089e6ca96
+      uses: docker/metadata-action@902fa8ec7d6ecbf8d84d538b9b233a880e428804
       with:
         images: ghcr.io/${{ github.repository }}_${{ matrix.arch }}
         tags: type=raw,value=${{ hashFiles('buildconfig/manylinux-build/**') }}
 
     - name: Build and push Docker image
       if: steps.inspect.outcome == 'failure'
-      uses: docker/build-push-action@0adf9959216b96bec444f325f1e493d4aa344497
+      uses: docker/build-push-action@471d1dc4e07e5cdedd4c2171150001c434f0b7a4
       with:
         context: ${{ github.workspace }}/buildconfig/manylinux-build/docker_base
         file: ${{ github.workspace }}/buildconfig/manylinux-build/docker_base/Dockerfile-${{ matrix.arch }}
@@ -93,7 +93,7 @@ jobs:
         CIBW_MANYLINUX_AARCH64_IMAGE: ghcr.io/${{ github.repository }}_aarch64:${{ steps.meta.outputs.version }}
         CIBW_MANYLINUX_PYPY_AARCH64_IMAGE: ghcr.io/${{ github.repository }}_aarch64:${{ steps.meta.outputs.version }}
 
-      uses: pypa/cibuildwheel@v2.22.0
+      uses: pypa/cibuildwheel@v2.23.0
 
     # We upload the generated files under github actions assets
     - name: Upload dist

.github/workflows/build-ubuntu-debug-python.yml

@@ -84,7 +84,7 @@ jobs:
 
     - name: Cache debug python build
       id: cache-python
-      uses: actions/cache@v4.2.1
+      uses: actions/cache@v4.2.2
       with:
         key: ${{ matrix.python }}
         path: ~/.pyenv/versions/${{ matrix.python }}-debug/**

.github/workflows/build-windows.yml

@@ -62,7 +62,7 @@ jobs:
           version: "0.5.26"
 
       - name: Build and test wheels
-        uses: pypa/cibuildwheel@v2.22.0
+        uses: pypa/cibuildwheel@v2.23.0
 
       - uses: actions/upload-artifact@v4
         with:

buildconfig/download_win_prebuilt.py

@@ -78,12 +78,12 @@ def get_urls(x86=True, x64=True):
     url_sha1 = []
     url_sha1.extend([
         [
-        'https://github.com/libsdl-org/SDL/releases/download/release-2.32.0/SDL2-devel-2.32.0-VC.zip',
-        'e4b39b4b81ca1d3beef1935113c7820e8d3bd307',
+        'https://github.com/libsdl-org/SDL/releases/download/release-2.32.2/SDL2-devel-2.32.2-VC.zip',
+        '08737e7e813443e47b663be4d91f8a4d8de6916b',
         ],
         [
-        'https://github.com/libsdl-org/SDL/releases/download/release-3.2.4/SDL3-devel-3.2.4-VC.zip',
-        '3576077236c7a66bf98d4b3d180aa4743ad5ce2e'
+        'https://github.com/libsdl-org/SDL/releases/download/release-3.2.6/SDL3-devel-3.2.6-VC.zip',
+        'a36424427129f9ae133e59cfe070fc0b418d7fe0'
         ],
         [
         'https://github.com/pygame-community/SDL_image/releases/download/2.8.4-pgce/SDL2_image-devel-2.8.4-VCpgce.zip',
@@ -98,8 +98,8 @@ def get_urls(x86=True, x64=True):
         '2d18b9a4fc2ec0eee80de2a946b088d4e6efd0ee'
         ],
         [
-        'https://github.com/libsdl-org/SDL_ttf/releases/download/preview-3.1.0/SDL3_ttf-devel-3.1.0-VC.zip',
-        '34bb4a03c6f0f6c9de3658bac98adc7029830578'
+        'https://github.com/libsdl-org/SDL_ttf/releases/download/release-3.2.0/SDL3_ttf-devel-3.2.0-VC.zip',
+        '2883df767c9b8c910c10108242542ef36054a267'
         ],
         [
         'https://github.com/libsdl-org/SDL_mixer/releases/download/release-2.8.1/SDL2_mixer-devel-2.8.1-VC.zip',
@@ -258,34 +258,34 @@ def copy(src, dst):
         copy(
             os.path.join(
                 temp_dir,
-                'SDL3_ttf-devel-3.1.0-VC/SDL3_ttf-3.1.0'
+                'SDL3_ttf-devel-3.2.0-VC/SDL3_ttf-3.2.0'
             ),
             os.path.join(
                 move_to_dir,
                 prebuilt_dir,
-                'SDL3_ttf-3.1.0'
+                'SDL3_ttf-3.2.0'
             )
         )
         copy(
             os.path.join(
                 temp_dir,
-                'SDL2-devel-2.32.0-VC/SDL2-2.32.0'
+                'SDL2-devel-2.32.2-VC/SDL2-2.32.2'
             ),
             os.path.join(
                 move_to_dir,
                 prebuilt_dir,
-                'SDL2-2.32.0'
+                'SDL2-2.32.2'
             )
         )
         copy(
             os.path.join(
                 temp_dir,
-                'SDL3-devel-3.2.4-VC/SDL3-3.2.4'
+                'SDL3-devel-3.2.6-VC/SDL3-3.2.6'
             ),
             os.path.join(
                 move_to_dir,
                 prebuilt_dir,
-                'SDL3-3.2.4'
+                'SDL3-3.2.6'
             )
         )
 

buildconfig/manylinux-build/docker_base/Dockerfile-aarch64

@@ -1,5 +1,5 @@
 # pin version on image for CI stability
-FROM quay.io/pypa/manylinux2014_aarch64:2024.11.16-1
+FROM quay.io/pypa/manylinux2014_aarch64:2025.02.23-1
 ENV MAKEFLAGS="-j 4"
 ENV PG_DEP_PREFIX="/usr/local"
 

buildconfig/manylinux-build/docker_base/Dockerfile-i686

@@ -1,5 +1,5 @@
 # pin version on image for CI stability
-FROM quay.io/pypa/manylinux2014_i686:2024.11.16-1
+FROM quay.io/pypa/manylinux2014_i686:2025.02.23-1
 ENV MAKEFLAGS="-j 4"
 ENV PG_DEP_PREFIX="/usr/local"
 

buildconfig/manylinux-build/docker_base/Dockerfile-x86_64

@@ -1,5 +1,5 @@
 # pin version on image for CI stability
-FROM quay.io/pypa/manylinux2014_x86_64:2024.11.16-1
+FROM quay.io/pypa/manylinux2014_x86_64:2025.02.23-1
 ENV MAKEFLAGS="-j 4"
 ENV PG_DEP_PREFIX="/usr/local"
 

buildconfig/manylinux-build/docker_base/sdl_libs/build-sdl2-libs.sh

@@ -3,7 +3,7 @@ set -e -x
 
 cd $(dirname `readlink -f "$0"`)
 
-SDL2_VER="2.32.0"
+SDL2_VER="2.32.2"
 SDL2="SDL2-$SDL2_VER"
 IMG2_VER="2.8.4"
 IMG2="SDL2_image-$IMG2_VER"