From: Miguel Liezun Date: Tue, 28 Oct 2025 12:27:00 +0000 (+0100) Subject: ci: update CI configuration to support riscv64 architecture and Rocky Linux X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=67e3590c1333fe9291a54b458f30d8f73108ac6f;p=thirdparty%2Fpsycopg.git ci: update CI configuration to support riscv64 architecture and Rocky Linux --- diff --git a/.github/workflows/packages-bin.yml b/.github/workflows/packages-bin.yml index cb2913bf2..e55947275 100644 --- a/.github/workflows/packages-bin.yml +++ b/.github/workflows/packages-bin.yml @@ -48,7 +48,7 @@ jobs: strategy: fail-fast: false matrix: - arch: [x86_64, ppc64le, aarch64] + arch: [x86_64, ppc64le, aarch64, riscv64] pyver: [cp310, cp311, cp312, cp313, cp314] platform: [manylinux, musllinux] @@ -79,8 +79,9 @@ jobs: CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014 CIBW_MANYLINUX_AARCH64_IMAGE: manylinux_2_28 CIBW_MANYLINUX_PPC64LE_IMAGE: manylinux2014 + CIBW_MANYLINUX_RISCV64_IMAGE: quay.io/pypa/manylinux_2_39_riscv64 CIBW_BUILD: ${{matrix.pyver}}-${{matrix.platform}}_${{matrix.arch}} - CIBW_ARCHS_LINUX: auto aarch64 ppc64le + CIBW_ARCHS_LINUX: auto aarch64 ppc64le riscv64 CIBW_BEFORE_ALL_LINUX: ./tools/ci/wheel_linux_before_all.sh CIBW_REPAIR_WHEEL_COMMAND: >- ./tools/ci/strip_wheel.sh {wheel} diff --git a/tools/ci/build_libpq.sh b/tools/ci/build_libpq.sh index bbcb7ca79..d99614c12 100755 --- a/tools/ci/build_libpq.sh +++ b/tools/ci/build_libpq.sh @@ -1,7 +1,7 @@ #!/bin/bash # Build a modern version of libpq and depending libs from source on Centos 5, -# Alpine or macOS +# Rocky Linux, Alpine or macOS set -euo pipefail @@ -48,10 +48,10 @@ fi # Install packages required to build the libpq. case "$ID" in - centos | almalinux) + centos | almalinux | rocky) yum update -y yum install -y flex cyrus-sasl-devel krb5-devel pam-devel \ - perl-IPC-Cmd perl-Time-Piece zlib-devel + perl perl-IPC-Cmd perl-Time-Piece zlib-devel ;; alpine) @@ -99,7 +99,7 @@ else ) fi -if [ "$ID" == "centos" ] || [ "$ID" == "almalinux" ]|| [ "$ID" == "macos" ]; then +if [ "$ID" == "centos" ] || [ "$ID" == "rocky" ] || [ "$ID" == "almalinux" ]|| [ "$ID" == "macos" ]; then if [[ ! -f "${LIBPQ_BUILD_PREFIX}/openssl.cnf" ]]; then # Build openssl if needed @@ -155,7 +155,7 @@ if [ "$ID" == "macos" ]; then fi -if [ "$ID" == "centos" ] || [ "$ID" == "almalinux" ]|| [ "$ID" == "macos" ]; then +if [ "$ID" == "centos" ] || [ "$ID" == "rocky" ] || [ "$ID" == "almalinux" ]|| [ "$ID" == "macos" ]; then if [[ ! -f "${LIBPQ_BUILD_PREFIX}/lib/libldap.${library_suffix}" ]]; then # Build openldap if needed diff --git a/tools/ci/wheel_linux_before_all.sh b/tools/ci/wheel_linux_before_all.sh index f779411ba..910bbe248 100755 --- a/tools/ci/wheel_linux_before_all.sh +++ b/tools/ci/wheel_linux_before_all.sh @@ -34,7 +34,7 @@ case "$ID" in apt-get -y install libpq-dev flex ;; - centos | almalinux) + centos | rocky | almalinux) "${dir}/build_libpq.sh" > /dev/null ;;