From 7fe97ddded9cb825bd96fe36c1255488d0d8f627 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Nov 2024 06:54:17 +0000 Subject: [PATCH 1/4] Bump pypa/cibuildwheel from 2.21.3 to 2.22.0 Bumps [pypa/cibuildwheel](https://github.com/pypa/cibuildwheel) from 2.21.3 to 2.22.0. - [Release notes](https://github.com/pypa/cibuildwheel/releases) - [Changelog](https://github.com/pypa/cibuildwheel/blob/main/docs/changelog.md) - [Commits](https://github.com/pypa/cibuildwheel/compare/v2.21.3...v2.22.0) --- updated-dependencies: - dependency-name: pypa/cibuildwheel dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/build-macos.yml | 2 +- .github/workflows/build-manylinux.yml | 2 +- .github/workflows/build-windows.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml index 23e304285f..769f92499a 100644 --- a/.github/workflows/build-macos.yml +++ b/.github/workflows/build-macos.yml @@ -138,7 +138,7 @@ jobs: uv-version: "0.4.10" - name: Build and test wheels - uses: pypa/cibuildwheel@v2.21.3 + uses: pypa/cibuildwheel@v2.22.0 - uses: actions/upload-artifact@v4 with: diff --git a/.github/workflows/build-manylinux.yml b/.github/workflows/build-manylinux.yml index 964569e0e7..a61fa3dfec 100644 --- a/.github/workflows/build-manylinux.yml +++ b/.github/workflows/build-manylinux.yml @@ -91,7 +91,7 @@ jobs: CIBW_MANYLINUX_I686_IMAGE: ghcr.io/${{ github.repository }}_i686:${{ steps.meta.outputs.version }} CIBW_MANYLINUX_PYPY_I686_IMAGE: ghcr.io/${{ github.repository }}_i686:${{ steps.meta.outputs.version }} - uses: pypa/cibuildwheel@v2.21.3 + uses: pypa/cibuildwheel@v2.22.0 # We upload the generated files under github actions assets - name: Upload dist diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml index d868bfabce..f7f72ac9b7 100644 --- a/.github/workflows/build-windows.yml +++ b/.github/workflows/build-windows.yml @@ -62,7 +62,7 @@ jobs: uv-version: "0.4.10" - name: Build and test wheels - uses: pypa/cibuildwheel@v2.21.3 + uses: pypa/cibuildwheel@v2.22.0 - uses: actions/upload-artifact@v4 with: From 1234c84bfe7ae2d080e3a80fa55b5cdde356d5ca Mon Sep 17 00:00:00 2001 From: Ankith Date: Tue, 26 Nov 2024 00:56:05 +0530 Subject: [PATCH 2/4] Sync docker base images to cibuildwheel --- buildconfig/manylinux-build/docker_base/Dockerfile-aarch64 | 2 +- buildconfig/manylinux-build/docker_base/Dockerfile-i686 | 2 +- buildconfig/manylinux-build/docker_base/Dockerfile-x86_64 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/buildconfig/manylinux-build/docker_base/Dockerfile-aarch64 b/buildconfig/manylinux-build/docker_base/Dockerfile-aarch64 index 061bd1da33..8092c9d070 100644 --- a/buildconfig/manylinux-build/docker_base/Dockerfile-aarch64 +++ b/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.10.07-1 +FROM quay.io/pypa/manylinux2014_aarch64:2024.11.16-1 ENV MAKEFLAGS="-j 2" ENV PG_DEP_PREFIX="/usr/local" diff --git a/buildconfig/manylinux-build/docker_base/Dockerfile-i686 b/buildconfig/manylinux-build/docker_base/Dockerfile-i686 index 86d901c9c8..46541c63de 100644 --- a/buildconfig/manylinux-build/docker_base/Dockerfile-i686 +++ b/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.10.07-1 +FROM quay.io/pypa/manylinux2014_i686:2024.11.16-1 ENV MAKEFLAGS="-j 2" ENV PG_DEP_PREFIX="/usr/local" diff --git a/buildconfig/manylinux-build/docker_base/Dockerfile-x86_64 b/buildconfig/manylinux-build/docker_base/Dockerfile-x86_64 index 1ffe460e8d..78090eed02 100644 --- a/buildconfig/manylinux-build/docker_base/Dockerfile-x86_64 +++ b/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.10.07-1 +FROM quay.io/pypa/manylinux2014_x86_64:2024.11.16-1 ENV MAKEFLAGS="-j 2" ENV PG_DEP_PREFIX="/usr/local" From f35dc0c693855ca0d6207f23f636f5fd7e80c3e8 Mon Sep 17 00:00:00 2001 From: Ankith Date: Tue, 26 Nov 2024 00:56:45 +0530 Subject: [PATCH 3/4] Bump cibw on circleci --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d8212fbe8b..3777927445 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -42,7 +42,7 @@ jobs: - run: name: Build the Linux wheels. command: | - pip3 install --user cibuildwheel==2.21.3 + pip3 install --user cibuildwheel==2.22.0 PATH="$HOME/.local/bin:$PATH" cibuildwheel --output-dir wheelhouse - store_artifacts: From 4f34cafeb31a81a5ea50b7dc98eea312a4543633 Mon Sep 17 00:00:00 2001 From: Ankith Date: Tue, 26 Nov 2024 14:34:31 +0530 Subject: [PATCH 4/4] Remove unneeded pkgconfig install to fix fail --- .github/workflows/build-macos.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml index 769f92499a..b5dabf38b7 100644 --- a/.github/workflows/build-macos.yml +++ b/.github/workflows/build-macos.yml @@ -64,7 +64,7 @@ jobs: if: steps.macdep-cache.outputs.cache-hit != 'true' run: | export MAC_ARCH="${{ matrix.macarch }}" - brew install coreutils pkg-config + brew install coreutils cd buildconfig/macdependencies bash ./build_mac_deps.sh @@ -104,7 +104,6 @@ jobs: # Setup macOS dependencies CIBW_BEFORE_ALL: | - brew install pkg-config cd buildconfig/macdependencies cp -r ${{ github.workspace }}/pygame_mac_deps_${{ matrix.macarch }} ${{ github.workspace }}/pygame_mac_deps bash ./install_mac_deps.sh