ci: build aarch64 packages using manylinux_2_28 image

diff --git a/.github/workflows/packages-bin.yml b/.github/workflows/packages-bin.yml
index 514a872ef3e90e58210f7b1fe7c6a276de2b3504..df41e3fcabad51eff537352fe3c158d8ca8394c7 100644 (file)
--- 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 0880526b89ac2a87d184b1c1dbdf749761933a7d..0ae0f1d5c18249d3e0e72e8b84057ce33f60890a 100755 (executable)
--- 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 3929bb6d3a39058ddc21ba42dcb07be3c7bb48f1..7cde59070ab43fa3e97daf4407e058b674b09091 100755 (executable)
--- 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 6a6283addab3495a0d369c365b2a955699d3d045..f779411ba0e401712153e05181c49a2ab7363824 100755 (executable)
--- 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
         ;;