From 68da879894397caa7ab8b603e1cfd7fe69e98e58 Mon Sep 17 00:00:00 2001 From: Bryan Culver Date: Mon, 6 Jun 2022 22:45:16 -0400 Subject: [PATCH 1/2] Move to manylinux_2_28 for aarch64, ppc64le builds. --- .github/workflows/packages.yml | 4 ++-- .../{build_manylinux_2_24.sh => build_manylinux_2_28.sh} | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) rename scripts/build/{build_manylinux_2_24.sh => build_manylinux_2_28.sh} (95%) diff --git a/.github/workflows/packages.yml b/.github/workflows/packages.yml index 39751032c..bc90d96b0 100644 --- a/.github/workflows/packages.yml +++ b/.github/workflows/packages.yml @@ -59,8 +59,8 @@ jobs: include: - {tag: manylinux2014, arch: x86_64} - {tag: manylinux2014, arch: i686} - - {tag: manylinux_2_24, arch: aarch64} - - {tag: manylinux_2_24, arch: ppc64le} + - {tag: manylinux_2_28, arch: aarch64} + - {tag: manylinux_2_28, arch: ppc64le} - {tag: musllinux_1_1, arch: x86_64} - {tag: musllinux_1_1, arch: i686} - {tag: musllinux_1_1, arch: aarch64} diff --git a/scripts/build/build_manylinux_2_24.sh b/scripts/build/build_manylinux_2_28.sh similarity index 95% rename from scripts/build/build_manylinux_2_24.sh rename to scripts/build/build_manylinux_2_28.sh index 742014add..404e43b28 100755 --- a/scripts/build/build_manylinux_2_24.sh +++ b/scripts/build/build_manylinux_2_28.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Create manylinux_2_24 wheels for psycopg2 +# Create manylinux_2_28 wheels for psycopg2 # # Look at the .github/workflows/packages.yml file for hints about how to use it. @@ -28,7 +28,7 @@ fi # Install prerequisite libraries curl -k -s https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - -echo "deb http://apt.postgresql.org/pub/repos/apt stretch-pgdg main" \ +echo "deb http://apt.postgresql.org/pub/repos/apt buster-pgdg main" \ > /etc/apt/sources.list.d/pgdg.list apt-get -y update apt-get install -y libpq-dev From f711c9e2bf9169d55d994644520ca64179522936 Mon Sep 17 00:00:00 2001 From: Bryan Culver Date: Tue, 7 Jun 2022 10:07:52 -0400 Subject: [PATCH 2/2] Install libpq-devel from yum --- scripts/build/build_manylinux_2_28.sh | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/scripts/build/build_manylinux_2_28.sh b/scripts/build/build_manylinux_2_28.sh index 404e43b28..318c2616d 100755 --- a/scripts/build/build_manylinux_2_28.sh +++ b/scripts/build/build_manylinux_2_28.sh @@ -27,11 +27,7 @@ if [[ "${PACKAGE_NAME:-}" ]]; then fi # Install prerequisite libraries -curl -k -s https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - -echo "deb http://apt.postgresql.org/pub/repos/apt buster-pgdg main" \ - > /etc/apt/sources.list.d/pgdg.list -apt-get -y update -apt-get install -y libpq-dev +yum install -y libpq-devel # Create the wheel packages for pyver in $PYVERS; do