From 3c82243f23ac42b92a42ab00a861d501966e522a Mon Sep 17 00:00:00 2001 From: Will Jones Date: Wed, 22 Jan 2025 20:12:42 -0800 Subject: [PATCH] ci: fix Python Arm build (#3409) We were using deprecated 2_24 for ARM, but that seems to have some issues. Dropping down to 2_17 for now to keep wide support, as I believe some of the popular cloud linuxes don't have >=2.28 glibc. --- .github/workflows/build_linux_wheel/action.yml | 9 ++------- .github/workflows/pypi-publish.yml | 5 ++++- .github/workflows/python.yml | 2 +- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build_linux_wheel/action.yml b/.github/workflows/build_linux_wheel/action.yml index 1d62d1ae1c..1e70c63203 100644 --- a/.github/workflows/build_linux_wheel/action.yml +++ b/.github/workflows/build_linux_wheel/action.yml @@ -69,12 +69,7 @@ runs: args: ${{ inputs.args }} before-script-linux: | set -e - apt install -y unzip - if [ $(uname -m) = "x86_64" ]; then - PROTOC_ARCH="x86_64" - else - PROTOC_ARCH="aarch_64" - fi - curl -L https://github.com/protocolbuffers/protobuf/releases/download/v24.4/protoc-24.4-linux-$PROTOC_ARCH.zip > /tmp/protoc.zip \ + yum install -y openssl-devel clang \ + && curl -L https://github.com/protocolbuffers/protobuf/releases/download/v24.4/protoc-24.4-linux-aarch_64.zip > /tmp/protoc.zip \ && unzip /tmp/protoc.zip -d /usr/local \ && rm /tmp/protoc.zip diff --git a/.github/workflows/pypi-publish.yml b/.github/workflows/pypi-publish.yml index 7e08b92838..cc5b776f6b 100644 --- a/.github/workflows/pypi-publish.yml +++ b/.github/workflows/pypi-publish.yml @@ -19,8 +19,11 @@ jobs: manylinux: "2_28" extra_args: "--features fp16kernels" - platform: aarch64 - manylinux: "2_24" + manylinux: "2_17" extra_args: "" + - platform: aarch64 + manylinux: "2_28" + extra_args: "--features fp16kernels" # We don't build fp16 kernels for aarch64, because it uses # cross compilation image, which doesn't have a new enough compiler. runs-on: "ubuntu-22.04" diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml index f26a22b7de..6583a21584 100644 --- a/.github/workflows/python.yml +++ b/.github/workflows/python.yml @@ -145,7 +145,7 @@ jobs: - uses: ./.github/workflows/build_linux_wheel with: arm-build: "true" - manylinux: "2_24" + manylinux: "2_28" - name: Install dependencies run: | sudo apt update -y -qq