Allow pip to be used when installing dependencies

radarhere · Sep 30, 2024 · 46d5e9c · 46d5e9c
1 parent 806902d
commit 46d5e9c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 35 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,39 +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-39-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_depends.sh b/manylinux2014-wheel-build/build_depends.sh
@@ -25,4 +25,7 @@ export PKG_CONFIG_PATH="$BUILD_PREFIX/lib/pkgconfig/:$PKG_CONFIG_PATH"
 
 yum install -y devtoolset-9-gcc devtoolset-9-gcc-c++
 
+PATH=/opt/_internal/tools/bin:$PATH
+python3 -m ensurepip
+
 . .github/workflows/wheels-dependencies.sh
diff --git a/manylinux_2_28-wheel-build/build_depends.sh b/manylinux_2_28-wheel-build/build_depends.sh
@@ -25,4 +25,7 @@ export PKG_CONFIG_PATH="$BUILD_PREFIX/lib/pkgconfig/:$PKG_CONFIG_PATH"
 
 dnf group install -y "Development Tools"
 
+PATH=/opt/_internal/tools/bin:$PATH
+python3 -m ensurepip
+
 . .github/workflows/wheels-dependencies.sh