From: Jelte Fennema Date: Tue, 1 Aug 2023 13:07:15 +0000 (+0200) Subject: test: add CI jobs to run libpq with PG master X-Git-Tag: pool-3.2.0~76^2~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d51930ed38304f6aafd1bfa106d665dd3a2fbec6;p=thirdparty%2Fpsycopg.git test: add CI jobs to run libpq with PG master --- diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 13660315f..98cf39c9b 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -30,11 +30,11 @@ jobs: - {impl: python, python: "3.8", postgres: "postgres:11"} - {impl: python, python: "3.9", postgres: "postgres:12"} - {impl: python, python: "3.10", postgres: "postgres:13"} - - {impl: python, python: "3.11", postgres: "postgres:14"} + - {impl: python, python: "3.11", postgres: "postgres:14", libpq: master} - {impl: python, python: "3.12.0-beta.4 - 3.12", postgres: "postgres:15", libpq: oldest} - {impl: c, python: "3.7", postgres: "postgres:15", libpq: newest} - - {impl: c, python: "3.8", postgres: "postgres:13"} + - {impl: c, python: "3.8", postgres: "postgres:13", libpq: master} - {impl: c, python: "3.9", postgres: "postgres:14"} - {impl: c, python: "3.10", postgres: "postgres:12"} - {impl: c, python: "3.11", postgres: "postgres:11", libpq: oldest} diff --git a/tools/build/ci_install_libpq.sh b/tools/build/ci_install_libpq.sh index 55525e37d..98db83ed8 100755 --- a/tools/build/ci_install_libpq.sh +++ b/tools/build/ci_install_libpq.sh @@ -13,9 +13,10 @@ rel=$(lsb_release -c -s) setup_repo () { version=${1:-} + repo_suffix=${2:-pgdg} curl -sL -o /etc/apt/trusted.gpg.d/apt.postgresql.org.asc \ https://www.postgresql.org/media/keys/ACCC4CF8.asc - echo "deb http://apt.postgresql.org/pub/repos/apt ${rel}-pgdg main ${version}" \ + echo "deb http://apt.postgresql.org/pub/repos/apt ${rel}-${repo_suffix} main ${version}" \ >> /etc/apt/sources.list.d/pgdg.list apt-get -qq update } @@ -39,6 +40,12 @@ case "$libpq" in apt-get -qq -y install "libpq-dev=${pqver}" "libpq5=${pqver}" ;; + master) + setup_repo 17 pgdg-snapshot + pqver=$(apt-cache show libpq5 | grep ^Version: | head -1 | awk '{print $2}') + apt-get -qq -y install "libpq-dev=${pqver}" "libpq5=${pqver}" + ;; + *) echo "Unexpected wanted libpq: '${libpq}'" >&2 exit 1