Skip to content

Commit

Permalink
feat: try riscv64
Browse files Browse the repository at this point in the history
  • Loading branch information
mayeut committed Feb 6, 2025
1 parent 8a86a05 commit 80777f9
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 3 deletions.
10 changes: 10 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ jobs:
("aarch64", "ubuntu-24.04-arm", ("manylinux2014", "manylinux_2_28", "manylinux_2_34", "musllinux_1_2")),
("i686", "ubuntu-24.04", ("manylinux2014", "musllinux_1_2")),
("armv7l", "ubuntu-24.04-arm", ("manylinux_2_31", "musllinux_1_2")),
("riscv64", "ubuntu-24.04", ("manylinux_2_31", "musllinux_1_2")),
]
expanded = [{"policy": policy, "platform": platform, "runner": runner} for platform, runner, policies in reduced for policy in policies]
print(json.dumps(expanded, indent=2))
Expand Down Expand Up @@ -82,6 +83,15 @@ jobs:
with:
fetch-depth: 50

- name: Set up QEMU
if: matrix.platform == 'riscv64'
uses: docker/setup-qemu-action@v3
with:
# This should be temporary
# xref https://github.com/docker/setup-qemu-action/issues/188
# xref https://github.com/tonistiigi/binfmt/issues/215
image: tonistiigi/binfmt:qemu-v8.1.5

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3

Expand Down
4 changes: 2 additions & 2 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -231,10 +231,10 @@ Toolchain: GCC 4.8
- i686 image: ``quay.io/pypa/manylinux1_i686``


musllinux_1_2 (Alpine Linux 3.20 based, 3.13+ compatible)
musllinux_1_2 (Alpine Linux 3.21 based, 3.13+ compatible)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Toolchain: GCC 13
Toolchain: GCC 14

- x86_64 image: ``quay.io/pypa/musllinux_1_2_x86_64``
- i686 image: ``quay.io/pypa/musllinux_1_2_i686``
Expand Down
3 changes: 2 additions & 1 deletion build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ case "${PLATFORM}" in
ppc64le) GOARCH="ppc64le";;
s390x) GOARCH="s390x";;
armv7l) GOARCH="arm/v7";;
riscv64) GOARCH="riscv64";;
*) echo "Unsupported platform: '${PLATFORM}'"; exit 1;;
esac

Expand Down Expand Up @@ -48,7 +49,7 @@ elif [ "${POLICY}" == "manylinux_2_34" ]; then
PREPEND_PATH="/usr/local/bin:${DEVTOOLSET_ROOTPATH}/usr/bin:"
LD_LIBRARY_PATH_ARG="${DEVTOOLSET_ROOTPATH}/usr/lib64:${DEVTOOLSET_ROOTPATH}/usr/lib:${DEVTOOLSET_ROOTPATH}/usr/lib64/dyninst:${DEVTOOLSET_ROOTPATH}/usr/lib/dyninst"
elif [ "${POLICY}" == "musllinux_1_2" ]; then
BASEIMAGE="alpine:3.20"
BASEIMAGE="alpine:3.21"
DEVTOOLSET_ROOTPATH=
PREPEND_PATH=
LD_LIBRARY_PATH_ARG=
Expand Down
6 changes: 6 additions & 0 deletions docker/build_scripts/finalize.sh
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,12 @@ for TOOL_PATH in "${MY_DIR}/requirements-tools/"*; do
case ${AUDITWHEEL_PLAT}-${TOOL} in
musllinux*_ppc64le-uv) continue;; # uv doesn't provide musl ppc64le wheels due to Rust issues
musllinux*_s390x-uv) continue;; # uv doesn't provide musl s390x wheels due to Rust issues
*_riscv64-uv) continue;; # no uv for riscv64
*_riscv64-cmake|*_riscv64-swig) manylinux_pkg_install "${TOOL}";;
*_riscv64-patchelf)
manylinux_pkg_install cmake
pipx install patchelf==0.17.2.1
;;
*) pipx install --pip-args="--require-hashes -r ${TOOL_PATH} --only-binary" "${TOOL}";;
esac
done
Expand Down

0 comments on commit 80777f9

Please sign in to comment.