From: Daniele Varrazzo Date: Fri, 10 Oct 2025 22:27:02 +0000 (+0200) Subject: ci: build aarch64 packages using manylinux_2_28 image X-Git-Tag: 3.3.0~50^2~2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2a2717eea85274779fda23d6d0b5de4923bae1f2;p=thirdparty%2Fpsycopg.git ci: build aarch64 packages using manylinux_2_28 image --- diff --git a/.github/workflows/packages-bin.yml b/.github/workflows/packages-bin.yml index 514a872ef..df41e3fca 100644 --- a/.github/workflows/packages-bin.yml +++ b/.github/workflows/packages-bin.yml @@ -94,7 +94,7 @@ jobs: package-dir: psycopg_binary env: CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014 - CIBW_MANYLINUX_AARCH64_IMAGE: manylinux2014 + CIBW_MANYLINUX_AARCH64_IMAGE: manylinux_2_28 CIBW_MANYLINUX_PPC64LE_IMAGE: manylinux2014 CIBW_BUILD: ${{matrix.pyver}}-${{matrix.platform}}_${{matrix.arch}} CIBW_ARCHS_LINUX: auto aarch64 ppc64le diff --git a/tools/ci/build_libpq.sh b/tools/ci/build_libpq.sh index 0880526b8..0ae0f1d5c 100755 --- a/tools/ci/build_libpq.sh +++ b/tools/ci/build_libpq.sh @@ -1,6 +1,7 @@ #!/bin/bash -# Build a modern version of libpq and depending libs from source on Centos 5, Alpine or macOS +# Build a modern version of libpq and depending libs from source on Centos 5, +# Alpine or macOS set -euo pipefail @@ -50,7 +51,7 @@ fi # Install packages required to build the libpq. case "$ID" in - centos) + centos | almalinux) yum update -y yum install -y flex krb5-devel pam-devel perl-IPC-Cmd perl-Time-Piece zlib-devel ;; @@ -100,7 +101,7 @@ else ) fi -if [ "$ID" == "centos" ] || [ "$ID" == "macos" ]; then +if [ "$ID" == "centos" ] || [ "$ID" == "almalinux" ]|| [ "$ID" == "macos" ]; then if [[ ! -f "${LIBPQ_BUILD_PREFIX}/openssl.cnf" ]]; then # Build openssl if needed @@ -156,7 +157,7 @@ if [ "$ID" == "macos" ]; then fi -if [ "$ID" == "centos" ] || [ "$ID" == "macos" ]; then +if [ "$ID" == "centos" ] || [ "$ID" == "almalinux" ]|| [ "$ID" == "macos" ]; then if [[ ! -f "${LIBPQ_BUILD_PREFIX}/lib/libsasl2.${library_suffix}" ]]; then # Build libsasl2 if needed @@ -189,7 +190,7 @@ if [ "$ID" == "centos" ] || [ "$ID" == "macos" ]; then fi -if [ "$ID" == "centos" ] || [ "$ID" == "macos" ]; then +if [ "$ID" == "centos" ] || [ "$ID" == "almalinux" ]|| [ "$ID" == "macos" ]; then if [[ ! -f "${LIBPQ_BUILD_PREFIX}/lib/libldap.${library_suffix}" ]]; then # Build openldap if needed diff --git a/tools/ci/print_so_versions.sh b/tools/ci/print_so_versions.sh index 3929bb6d3..7cde59070 100755 --- a/tools/ci/print_so_versions.sh +++ b/tools/ci/print_so_versions.sh @@ -25,12 +25,7 @@ case "$ID" in done) | sort | uniq ;; - centos) - echo "TODO!" - ;; - *) - echo "$0: unexpected Linux distribution: '$ID'" >&2 - exit 1 + echo "$0: TODO! unexpected Linux distribution: '$ID'" >&2 ;; esac diff --git a/tools/ci/wheel_linux_before_all.sh b/tools/ci/wheel_linux_before_all.sh index 6a6283add..f779411ba 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) + centos | almalinux) "${dir}/build_libpq.sh" > /dev/null ;;