From 4ddf837ab4e45dd6f46d593cff0696a11e899d74 Mon Sep 17 00:00:00 2001 From: Sam Rose Date: Wed, 18 Jun 2025 11:21:17 -0400 Subject: [PATCH 01/11] fix: pin version of libpq to the major version installed --- ansible/tasks/setup-postgrest.yml | 2 +- ansible/vars.yml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ansible/tasks/setup-postgrest.yml b/ansible/tasks/setup-postgrest.yml index a98d1990f..823246eb0 100644 --- a/ansible/tasks/setup-postgrest.yml +++ b/ansible/tasks/setup-postgrest.yml @@ -20,7 +20,7 @@ - name: PostgREST - system dependencies apt: pkg: - - libpq5 + - "libpq5={{ postgresql_major }}.*" - libnuma-dev - name: PostgREST - remove Postgres PPA gpg key diff --git a/ansible/vars.yml b/ansible/vars.yml index 2838d6f92..f3a124e27 100644 --- a/ansible/vars.yml +++ b/ansible/vars.yml @@ -9,9 +9,9 @@ postgres_major: # Full version strings for each major version postgres_release: - postgresorioledb-17: "17.0.1.093-orioledb" - postgres17: "17.4.1.043" - postgres15: "15.8.1.100" + postgresorioledb-17: "17.0.1.094-orioledb-libpq-1" + postgres17: "17.4.1.044-libpq-1" + postgres15: "15.8.1.101-libpq-1" # Non Postgres Extensions pgbouncer_release: "1.19.0" From fdffe8fd71f5c658e1c66e049d424f68ea3ba48e Mon Sep 17 00:00:00 2001 From: Sam Rose Date: Wed, 18 Jun 2025 11:32:36 -0400 Subject: [PATCH 02/11] fix: the variable is postgresql_major_version --- ansible/tasks/setup-postgrest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/tasks/setup-postgrest.yml b/ansible/tasks/setup-postgrest.yml index 823246eb0..301952289 100644 --- a/ansible/tasks/setup-postgrest.yml +++ b/ansible/tasks/setup-postgrest.yml @@ -20,7 +20,7 @@ - name: PostgREST - system dependencies apt: pkg: - - "libpq5={{ postgresql_major }}.*" + - "libpq5={{ postgresql_major_version }}.*" - libnuma-dev - name: PostgREST - remove Postgres PPA gpg key From a3d5d22eaa5ea40b378997ae49f8d8daf8865721 Mon Sep 17 00:00:00 2001 From: Sam Rose Date: Wed, 18 Jun 2025 13:10:23 -0400 Subject: [PATCH 03/11] fix: using the correct var --- ansible/tasks/setup-postgrest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/tasks/setup-postgrest.yml b/ansible/tasks/setup-postgrest.yml index 301952289..823246eb0 100644 --- a/ansible/tasks/setup-postgrest.yml +++ b/ansible/tasks/setup-postgrest.yml @@ -20,7 +20,7 @@ - name: PostgREST - system dependencies apt: pkg: - - "libpq5={{ postgresql_major_version }}.*" + - "libpq5={{ postgresql_major }}.*" - libnuma-dev - name: PostgREST - remove Postgres PPA gpg key From be1e9e37a0fa2836d45f9d4b54e6cf754c5b11ac Mon Sep 17 00:00:00 2001 From: Sam Rose Date: Wed, 18 Jun 2025 15:45:34 -0400 Subject: [PATCH 04/11] fix: default to postgres 15 major version --- ansible/tasks/setup-postgrest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/tasks/setup-postgrest.yml b/ansible/tasks/setup-postgrest.yml index 823246eb0..70486a085 100644 --- a/ansible/tasks/setup-postgrest.yml +++ b/ansible/tasks/setup-postgrest.yml @@ -20,7 +20,7 @@ - name: PostgREST - system dependencies apt: pkg: - - "libpq5={{ postgresql_major }}.*" + - "libpq5={{ postgresql_major | default('15') }}.*" - libnuma-dev - name: PostgREST - remove Postgres PPA gpg key From e2c34cf083d1986bffef2ee64687b473b6963fcd Mon Sep 17 00:00:00 2001 From: Sam Rose Date: Wed, 18 Jun 2025 16:03:16 -0400 Subject: [PATCH 05/11] fix: default to 15 --- ansible/tasks/setup-postgrest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/tasks/setup-postgrest.yml b/ansible/tasks/setup-postgrest.yml index 70486a085..0738a820b 100644 --- a/ansible/tasks/setup-postgrest.yml +++ b/ansible/tasks/setup-postgrest.yml @@ -20,7 +20,7 @@ - name: PostgREST - system dependencies apt: pkg: - - "libpq5={{ postgresql_major | default('15') }}.*" + - "libpq5=15.*" - libnuma-dev - name: PostgREST - remove Postgres PPA gpg key From 39e9e5f899312fe909a2f77737a5b856e9901ab7 Mon Sep 17 00:00:00 2001 From: Sam Rose Date: Wed, 18 Jun 2025 16:36:10 -0400 Subject: [PATCH 06/11] fix: supposedly main contains all releases for libpq5 --- ansible/tasks/setup-postgrest.yml | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/ansible/tasks/setup-postgrest.yml b/ansible/tasks/setup-postgrest.yml index 0738a820b..b261d5e52 100644 --- a/ansible/tasks/setup-postgrest.yml +++ b/ansible/tasks/setup-postgrest.yml @@ -8,20 +8,23 @@ - name: PostgREST - add Postgres PPA apt_repository: - repo: "deb http://apt.postgresql.org/pub/repos/apt/ focal-pgdg {{ postgresql_major }}" + repo: "deb http://apt.postgresql.org/pub/repos/apt/ focal-pgdg main" state: present + filename: postgresql-pgdg -- name: PostgREST - update apt cache - apt: - update_cache: yes - -# libpq is a C library that enables user programs to communicate with -# the PostgreSQL database server. -- name: PostgREST - system dependencies +- name: PostgREST - install system dependencies apt: pkg: - - "libpq5=15.*" + - "libpq5>=15" - libnuma-dev + update_cache: yes + state: present + +- name: PostgREST - verify libpq5 version + shell: dpkg -l libpq5 | grep '^ii' | awk '{print $3}' | grep -E '^15' + register: libpq5_version + failed_when: libpq5_version.rc != 0 + changed_when: false - name: PostgREST - remove Postgres PPA gpg key apt_key: @@ -88,7 +91,6 @@ #! /usr/bin/env bash set -euo pipefail set -x - cd "$(dirname "$0")" cat $@ > merged.conf dest: /etc/postgrest/merge.sh From 359da136535a951cd3b0919b5b3cd746abb922e5 Mon Sep 17 00:00:00 2001 From: Sam Rose Date: Wed, 18 Jun 2025 22:10:44 -0400 Subject: [PATCH 07/11] fix: syntax --- ansible/tasks/setup-postgrest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/tasks/setup-postgrest.yml b/ansible/tasks/setup-postgrest.yml index b261d5e52..752164d75 100644 --- a/ansible/tasks/setup-postgrest.yml +++ b/ansible/tasks/setup-postgrest.yml @@ -15,7 +15,7 @@ - name: PostgREST - install system dependencies apt: pkg: - - "libpq5>=15" + - "libpq5 (>= 15)" - libnuma-dev update_cache: yes state: present From 39339557fbb406f9c9943954e582743a9caebdb4 Mon Sep 17 00:00:00 2001 From: Sam Rose Date: Thu, 19 Jun 2025 04:50:07 -0400 Subject: [PATCH 08/11] fix: different syntax --- ansible/tasks/setup-postgrest.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/ansible/tasks/setup-postgrest.yml b/ansible/tasks/setup-postgrest.yml index 752164d75..6efcb0db3 100644 --- a/ansible/tasks/setup-postgrest.yml +++ b/ansible/tasks/setup-postgrest.yml @@ -14,10 +14,14 @@ - name: PostgREST - install system dependencies apt: - pkg: - - "libpq5 (>= 15)" - - libnuma-dev + name: libpq5 + version: ">=15" + state: present update_cache: yes + +- name: PostgREST - install libnuma-dev + apt: + name: libnuma-dev state: present - name: PostgREST - verify libpq5 version From eaa74fe98aa976b2e072843724a1019c1d69de71 Mon Sep 17 00:00:00 2001 From: Sam Rose Date: Thu, 19 Jun 2025 05:10:51 -0400 Subject: [PATCH 09/11] fix: rely on ppa --- ansible/tasks/setup-postgrest.yml | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/ansible/tasks/setup-postgrest.yml b/ansible/tasks/setup-postgrest.yml index 6efcb0db3..fcd489f3c 100644 --- a/ansible/tasks/setup-postgrest.yml +++ b/ansible/tasks/setup-postgrest.yml @@ -14,22 +14,21 @@ - name: PostgREST - install system dependencies apt: - name: libpq5 - version: ">=15" - state: present + package: + - libpq5 + - libnuma-dev update_cache: yes - -- name: PostgREST - install libnuma-dev - apt: - name: libnuma-dev state: present - name: PostgREST - verify libpq5 version - shell: dpkg -l libpq5 | grep '^ii' | awk '{print $3}' | grep -E '^15' + shell: dpkg -l libpq5 | grep '^ii' | awk '{print $3}' register: libpq5_version - failed_when: libpq5_version.rc != 0 changed_when: false +- name: Show installed libpq5 version + debug: + msg: "Installed libpq5 version: {{ libpq5_version.stdout }}" + - name: PostgREST - remove Postgres PPA gpg key apt_key: url: https://www.postgresql.org/media/keys/ACCC4CF8.asc From 4a87f0ce78f5bc9743f5acc629887471eb3dd7ce Mon Sep 17 00:00:00 2001 From: Sam Rose Date: Thu, 19 Jun 2025 06:32:14 -0400 Subject: [PATCH 10/11] fix: ppa removal --- ansible/tasks/setup-postgrest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/tasks/setup-postgrest.yml b/ansible/tasks/setup-postgrest.yml index fcd489f3c..cd88f585c 100644 --- a/ansible/tasks/setup-postgrest.yml +++ b/ansible/tasks/setup-postgrest.yml @@ -36,7 +36,7 @@ - name: PostgREST - remove Postgres PPA apt_repository: - repo: "deb http://apt.postgresql.org/pub/repos/apt/ focal-pgdg {{ postgresql_major }}" + repo: "deb http://apt.postgresql.org/pub/repos/apt/ focal-pgdg main" state: absent - name: postgis - ensure dependencies do not get autoremoved From b68c4946d23388cb812960c4cc444667091b5309 Mon Sep 17 00:00:00 2001 From: Sam Rose Date: Thu, 19 Jun 2025 06:58:07 -0400 Subject: [PATCH 11/11] fix: change to trigger workflow --- ansible/tasks/setup-postgrest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/tasks/setup-postgrest.yml b/ansible/tasks/setup-postgrest.yml index cd88f585c..b6e0f951c 100644 --- a/ansible/tasks/setup-postgrest.yml +++ b/ansible/tasks/setup-postgrest.yml @@ -6,7 +6,7 @@ url: https://www.postgresql.org/media/keys/ACCC4CF8.asc state: present -- name: PostgREST - add Postgres PPA +- name: PostgREST - add Postgres PPA main apt_repository: repo: "deb http://apt.postgresql.org/pub/repos/apt/ focal-pgdg main" state: present