diff --git a/Applications/Python/Dockerfile b/Applications/Python/Dockerfile deleted file mode 100644 index 24be7f0ea6b4a4f3564fe37c2b8d535d052227b4..0000000000000000000000000000000000000000 --- a/Applications/Python/Dockerfile +++ /dev/null @@ -1,4 +0,0 @@ -ARG MANYLINUX_IMAGE=manylinux2014_x86_64 -FROM quay.io/pypa/$MANYLINUX_IMAGE - -RUN yum -y install ccache diff --git a/pyproject.toml b/pyproject.toml index b8e34812fbed6cf19f3fbf08ff1a28210d4723b8..43c8853d7ec2934a6943834435bb5633c1a9bd44 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -22,8 +22,11 @@ build-verbosity = "1" [tool.cibuildwheel.linux] skip = ["*musllinux*", "cp36-*"] -manylinux-x86_64-image = "manylinux2014" -manylinux-aarch64-image = "manylinux2014" +# See https://github.com/NixOS/patchelf/issues/446 +# quay.io/pypa/manylinux_2_28 works too +manylinux-x86_64-image = "quay.io/pypa/manylinux2014_x86_64@sha256:005826a6fa94c97bd31fccf637a0f10621304da447ca2ab3963c13991dffa013" +manylinux-aarch64-image = "quay.io/pypa/manylinux2014_x86_64@sha256:005826a6fa94c97bd31fccf637a0f10621304da447ca2ab3963c13991dffa013" +before-all = "yum install -y ccache" environment-pass = [ "SETUPTOOLS_SCM_LOCAL_SCHEME", "CPM_SOURCE_CACHE", diff --git a/scripts/ci/jobs/build-wheels.yml b/scripts/ci/jobs/build-wheels.yml index bab661489cc4600811a0b43af22facc4b989a2da..bcc629a7054d21ba23497b6eaf4be3b3cc4e487c 100644 --- a/scripts/ci/jobs/build-wheels.yml +++ b/scripts/ci/jobs/build-wheels.yml @@ -33,12 +33,9 @@ include: build wheels linux: tags: [envinf3-shell] variables: - CIBW_MANYLINUX_X86_64_IMAGE: quay.io/pypa/manylinux2014_x86_64_ccache CPM_SOURCE_CACHE: /host/cibuildwheel_cache/cpm CCACHE_DIR: /host/cibuildwheel_cache/ccache CCACHE_MAXSIZE: 15G - before_script: - - docker build -t ${CIBW_MANYLINUX_X86_64_IMAGE} -f Applications/Python/Dockerfile Applications/Python <<: *wheels_template build wheels mac: