From: Daniele Varrazzo <daniele.varrazzo@gmail.com>
Date: Thu, 30 Sep 2021 19:02:11 +0000 (+0200)
Subject: Build Python 3.10 packages
X-Git-Tag: 3.0~41^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2b4baed6625c38e376ad3bbf6bd66d0cf7acda46;p=thirdparty%2Fpsycopg.git

Build Python 3.10 packages
---

diff --git a/.github/workflows/packages.yml b/.github/workflows/packages.yml
index 869627af0..7acebec46 100644
--- a/.github/workflows/packages.yml
+++ b/.github/workflows/packages.yml
@@ -89,9 +89,10 @@ jobs:
     runs-on: ubuntu-20.04
 
     strategy:
+      fail-fast: false
       matrix:
         arch: [x86_64, i686, ppc64le, aarch64]
-        pyver: [cp36, cp37, cp38, cp39]
+        pyver: [cp36, cp37, cp38, cp39, cp310]
 
     steps:
       - uses: actions/checkout@v2
@@ -103,7 +104,7 @@ jobs:
         run: python3 ./tools/build/copy_to_binary.py
 
       - name: Build wheels
-        uses: pypa/cibuildwheel@v1.12.0
+        uses: pypa/cibuildwheel@v2.1.2
         with:
           package-dir: psycopg_binary
         env:
@@ -147,10 +148,11 @@ jobs:
     runs-on: macos-10.15
 
     strategy:
+      fail-fast: false
       matrix:
         # These archs require an Apple M1 runner: [arm64, universal2]
         arch: [x86_64]
-        pyver: [cp36, cp37, cp38, cp39]
+        pyver: [cp36, cp37, cp38, cp39, cp310]
 
     steps:
       - uses: actions/checkout@v2
@@ -159,7 +161,7 @@ jobs:
         run: python3 ./tools/build/copy_to_binary.py
 
       - name: Build wheels
-        uses: pypa/cibuildwheel@v1.12.0
+        uses: pypa/cibuildwheel@v2.1.2
         with:
           package-dir: psycopg_binary
         env:
@@ -184,10 +186,11 @@ jobs:
     runs-on: windows-2019
 
     strategy:
+      fail-fast: false
       matrix:
         # Might want to add win32, untested at the moment.
         arch: [win_amd64]
-        pyver: [cp36, cp37, cp38, cp39]
+        pyver: [cp36, cp37, cp38, cp39, cp310]
 
     steps:
       - uses: actions/checkout@v2
@@ -202,7 +205,7 @@ jobs:
         run: python3 ./tools/build/copy_to_binary.py
 
       - name: Build wheels
-        uses: pypa/cibuildwheel@v1.12.0
+        uses: pypa/cibuildwheel@v2.1.2
         with:
           package-dir: psycopg_binary
         env:
diff --git a/tools/build/wheel_linux_before_all.sh b/tools/build/wheel_linux_before_all.sh
index 6e7e8a3e6..0fe4161e0 100755
--- a/tools/build/wheel_linux_before_all.sh
+++ b/tools/build/wheel_linux_before_all.sh
@@ -15,7 +15,10 @@ if [[ ! "$AUDITWHEEL_ARCH" = "aarch64" ]]; then
     source /etc/os-release
     echo "deb http://apt.postgresql.org/pub/repos/apt ${VERSION_CODENAME}-pgdg main" \
         > /etc/apt/sources.list.d/pgdg.list
-    curl --silent https://www.postgresql.org/media/keys/ACCC4CF8.asc \
+    # TODO: on 2021-09-30 curl fails with
+    # curl: (60) SSL certificate problem: certificate has expired
+    # Test again later if -k can be removed.
+    curl -sk https://www.postgresql.org/media/keys/ACCC4CF8.asc \
         | apt-key add -
 fi
 apt-get update