is not a supported wheel on this platform.

radarhere · Nov 2, 2024 · 4ae3fc4 · 4ae3fc4
1 parent 2b956a7
commit 4ae3fc4
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 36 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -3,10 +3,6 @@ name: Docker images
 
 on: [push, pull_request, workflow_dispatch]
 
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
 jobs:
   build:
     name: ${{ matrix.image }}
@@ -15,38 +11,8 @@ jobs:
       fail-fast: false
       matrix:
         image:
-          # Run slower jobs first to give them a headstart and reduce waiting time
-          - "ubuntu-22.04-jammy-arm64v8"
-          - "ubuntu-24.04-noble-ppc64le"
-          - "ubuntu-24.04-noble-s390x"
-          # test image for manylinux-wheel build
-          - "ubuntu-24.04-noble-amd64"
-          # Then run the remainder
-          - "alpine"
-          - "amazon-2-amd64"
-          - "amazon-2023-amd64"
-          - "arch"
-          - "centos-stream-9-amd64"
-          - "debian-12-bookworm-x86"
-          - "debian-12-bookworm-amd64"
-          - "fedora-40-amd64"
-          - "gentoo"
-          - "ubuntu-22.04-jammy-amd64"
-          - "ubuntu-22.04-jammy-amd64-valgrind"
-          # has a dependency on the test image
           - "manylinux2014-wheel-build"
           - "manylinux_2_28-wheel-build"
-        include:
-          - image: "manylinux2014-wheel-build"
-            test-image: "ubuntu-24.04-noble-amd64"
-          - image: "manylinux_2_28-wheel-build"
-            test-image: "ubuntu-24.04-noble-amd64"
-          - image: "ubuntu-22.04-jammy-arm64v8"
-            qemu-arch: "aarch64"
-          - image: "ubuntu-24.04-noble-ppc64le"
-            qemu-arch: "ppc64le"
-          - image: "ubuntu-24.04-noble-s390x"
-            qemu-arch: "s390x"
 
     steps:
       - uses: actions/checkout@v4

diff --git a/manylinux2014-wheel-build/build.sh b/manylinux2014-wheel-build/build.sh
@@ -19,14 +19,18 @@ rm -f /tmp/*.whl || true
 # Python version, as 39,310,311,312,313. Defaults to 313.
 # Matches the naming in /opt/python/
 PYVER=${1:-313}
-PYBIN=$(echo /opt/python/cp${PYVER}*/bin)
+PYBIN=$(echo /opt/python/cp313-cp313/bin)
 
 # We have to clean up the Pillow directories, otherwise we might get
 # cached builds that are not manylinux wheel compatible
 cd /Pillow
 PATH=$PYBIN:$PATH make clean
 
 # Build and repair
+echo "torch"
+ls -la  /opt/python
+echo "torch2"
+ls -la $PYBIN
 $PYBIN/pip --verbose wheel ${OPTS} -w /tmp /Pillow
 $PYBIN/pip install auditwheel
 $PYBIN/python3 -m auditwheel repair /tmp/pillow*whl -w /output
diff --git a/manylinux_2_28-wheel-build/build.sh b/manylinux_2_28-wheel-build/build.sh
@@ -19,14 +19,21 @@ rm -f /tmp/*.whl || true
 # Python version, as 39,310,311,312,313. Defaults to 313.
 # Matches the naming in /opt/python/
 PYVER=${1:-313}
-PYBIN=$(echo /opt/python/cp${PYVER}*/bin)
+PYBIN=$(echo /opt/python/cp313-cp313/bin)
 
 # We have to clean up the Pillow directories, otherwise we might get
 # cached builds that are not manylinux wheel compatible
 cd /Pillow
 PATH=$PYBIN:$PATH make clean
 
 # Build and repair
+echo "torch"
+ls -la  /opt/python
+echo "torch2"
+ls -la $PYBIN
+echo "torch3"
+$PYBIN/pip --version
+echo "torch4"
 $PYBIN/pip --verbose wheel ${OPTS} -w /tmp /Pillow
 $PYBIN/pip install auditwheel
 $PYBIN/python3 -m auditwheel repair /tmp/pillow*whl -w /output