From e40a8e1cc713b9b48d9da551ab9467bd3f2a0284 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Roche?= Date: Thu, 9 Oct 2025 21:56:51 +0200 Subject: [PATCH 1/4] feat(wrappers): add versions 0.4.5, 0.4.6, and 0.5.0 --- nix/ext/versions.json | 27 +++++++++++++++++++++++++++ nix/ext/wrappers/default.nix | 21 ++++++++++++++------- 2 files changed, 41 insertions(+), 7 deletions(-) diff --git a/nix/ext/versions.json b/nix/ext/versions.json index b5c000c7e..9774a1341 100644 --- a/nix/ext/versions.json +++ b/nix/ext/versions.json @@ -471,6 +471,33 @@ } }, "wrappers": { + "0.4.5": { + "postgresql": [ + "15", + "17" + ], + "hash": "sha256-IgDfVFROMCHYLZ/Iqj12MsQjPPCdRoH+3oi3Ki/iaRI=", + "pgrx": "0.12.9", + "rust": "1.81.0" + }, + "0.4.6": { + "postgresql": [ + "15", + "17" + ], + "hash": "sha256-hthb3qEXT1Kf4yPoq0udEbQzlyLtI5tug6sK4YAPFjU=", + "pgrx": "0.12.9", + "rust": "1.84.0" + }, + "0.5.0": { + "postgresql": [ + "15", + "17" + ], + "hash": "sha256-FbRTUcpEHBa5DI6dutvBeahYM0RZVAXIzIAZWIaxvn0=", + "pgrx": "0.12.9", + "rust": "1.84.0" + }, "0.5.4": { "postgresql": [ "15", diff --git a/nix/ext/wrappers/default.nix b/nix/ext/wrappers/default.nix index 606eca7e9..13648fdc8 100644 --- a/nix/ext/wrappers/default.nix +++ b/nix/ext/wrappers/default.nix @@ -162,12 +162,6 @@ let } ); previouslyPackagedVersions = [ - "0.5.3" - "0.5.2" - "0.5.1" - "0.5.0" - "0.4.6" - "0.4.5" "0.4.4" "0.4.3" "0.4.2" @@ -214,6 +208,7 @@ buildEnv { "/share/postgresql/extension" ]; postBuild = '' + create_control_files() { # Create main control file pointing to latest version { @@ -233,6 +228,19 @@ buildEnv { } create_migration_sql_files() { + PREVIOUS_VERSION="" + while IFS= read -r i; do + FILENAME=$(basename "$i") + DIRNAME=$(dirname "$i") + VERSION="$(grep -oE '[0-9]+\.[0-9]+\.[0-9]+' <<< $FILENAME)" + if [[ "$PREVIOUS_VERSION" != "" ]]; then + echo "Processing $i" + MIGRATION_FILENAME="$DIRNAME/''${FILENAME/$VERSION/$PREVIOUS_VERSION--$VERSION}" + cp "$i" "$MIGRATION_FILENAME" + fi + PREVIOUS_VERSION="$VERSION" + done < <(find $out -name '*.sql' | sort -V) + # Create migration SQL files from previous versions to newer versions for prev_version in ${lib.concatStringsSep " " previouslyPackagedVersions}; do for curr_version in ${lib.concatStringsSep " " versions}; do @@ -252,7 +260,6 @@ buildEnv { create_lib_files create_migration_sql_files - # checks (test "$(ls -A $out/lib/${pname}*${postgresql.dlSuffix} | wc -l)" = "${ toString (numberOfVersions + numberOfPreviouslyPackagedVersions + 1) }") From b980d07a411e6de6a42405d1947c97177a31cdf2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Roche?= Date: Thu, 9 Oct 2025 23:08:17 +0200 Subject: [PATCH 2/4] feat(wrappers): add versions 0.4.3, 0.4.4, 0.5.5 --- nix/cargo-pgrx/versions.json | 9 +++++++++ nix/ext/versions.json | 27 +++++++++++++++++++++++++++ nix/ext/wrappers/default.nix | 12 ++++++++++-- 3 files changed, 46 insertions(+), 2 deletions(-) diff --git a/nix/cargo-pgrx/versions.json b/nix/cargo-pgrx/versions.json index 4c8d6bef5..53b2c378c 100644 --- a/nix/cargo-pgrx/versions.json +++ b/nix/cargo-pgrx/versions.json @@ -99,5 +99,14 @@ "cargoHash": "sha256-Ny7j56pwB+2eEK62X0nWfFKQy5fBz+Q1oyvecivxLkk=" } } + }, + "0.16.0": { + "hash": "sha256-emNR7fXNVD9sY/Mdno7mwpH6l/7AD28cBUsFRn9je50=", + "rust": { + "1.87.0": { + "cargoHash": "sha256-pK6OxRNubcWhohLvIJIliRtaHSIQOhQp7Q9brPygZYA=" + } + } } + } diff --git a/nix/ext/versions.json b/nix/ext/versions.json index 9774a1341..8f38938c9 100644 --- a/nix/ext/versions.json +++ b/nix/ext/versions.json @@ -471,6 +471,23 @@ } }, "wrappers": { + "0.4.3": { + "postgresql": [ + "15" + ], + "hash": "sha256-CkoNMoh40zbQL4V49ZNYgv3JjoNWjODtTpHn+L8DdZA=", + "pgrx": "0.12.6", + "rust": "1.80.0" + }, + "0.4.4": { + "postgresql": [ + "15", + "17" + ], + "hash": "sha256-QoGFJpq8PuvMM8SS+VZd7MlNl56uFivRjs1tCtwX+oE=", + "pgrx": "0.12.6", + "rust": "1.80.0" + }, "0.4.5": { "postgresql": [ "15", @@ -507,6 +524,16 @@ "hash": "sha256-W1RokXH4Vfj2FIuEzGEP5SzzWsv2Pbzfa816nXKnSoc=", "pgrx": "0.14.3", "rust": "1.87.0" + }, + "0.5.5": { + "postgresql": [ + "15", + "17", + "orioledb-17" + ], + "hash": "sha256-tWa1XewJbbqarwWkJPfvCIev7Fn0hLJRzYiz0vuebyA=", + "pgrx": "0.16.0", + "rust": "1.87.0" } } } diff --git a/nix/ext/wrappers/default.nix b/nix/ext/wrappers/default.nix index 13648fdc8..a956cb184 100644 --- a/nix/ext/wrappers/default.nix +++ b/nix/ext/wrappers/default.nix @@ -83,6 +83,16 @@ let "clickhouse-rs-1.1.0-alpha.1" = "sha256-nKiGzdsAgJej8NgyVOqHaD1sZLrNF1RPfEhu2pRwZ6o="; "iceberg-catalog-s3tables-0.5.1" = "sha256-1JkB2JExukABlbW1lZPolNQCYb9URi8xNYY3APmiGq0="; } + else if builtins.compareVersions "0.5.4" version == 0 then + { + "clickhouse-rs-1.1.0-alpha.1" = "sha256-nKiGzdsAgJej8NgyVOqHaD1sZLrNF1RPfEhu2pRwZ6o="; + "iceberg-catalog-s3tables-0.5.1" = "sha256-1JkB2JExukABlbW1lZPolNQCYb9URi8xNYY3APmiGq0="; + } + else if builtins.compareVersions "0.5.5" version == 0 then + { + "clickhouse-rs-1.1.0-alpha.1" = "sha256-nKiGzdsAgJej8NgyVOqHaD1sZLrNF1RPfEhu2pRwZ6o="; + "iceberg-catalog-s3tables-0.6.0" = "sha256-AUK7B0wMqQZwJho91woLs8uOC4k1RdUEEN5Khw2OoqQ="; + } else { "clickhouse-rs-1.1.0-alpha.1" = "sha256-nKiGzdsAgJej8NgyVOqHaD1sZLrNF1RPfEhu2pRwZ6o="; @@ -162,8 +172,6 @@ let } ); previouslyPackagedVersions = [ - "0.4.4" - "0.4.3" "0.4.2" "0.4.1" "0.4.0" From fd7cbf556b03d36116b851f8b6de3ee48dd9b371 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Roche?= Date: Fri, 10 Oct 2025 11:06:14 +0200 Subject: [PATCH 3/4] feat(wrappers): add versions 0.3.0, 0.4.1, 0.4.2 --- nix/ext/versions.json | 24 ++++++++++++++++++++++++ nix/ext/wrappers/default.nix | 5 ----- 2 files changed, 24 insertions(+), 5 deletions(-) diff --git a/nix/ext/versions.json b/nix/ext/versions.json index 8f38938c9..b7d88bbd9 100644 --- a/nix/ext/versions.json +++ b/nix/ext/versions.json @@ -471,6 +471,30 @@ } }, "wrappers": { + "0.3.0": { + "postgresql": [ + "15" + ], + "hash": "sha256-ogpF8NJ7kW3Ut8jaKMDiKYIXnI38nfRq2mMK4rqFAIA=", + "pgrx": "0.11.3", + "rust": "1.76.0" + }, + "0.4.1": { + "postgresql": [ + "15" + ], + "hash": "sha256-AU9Y43qEMcIBVBThu+Aor1HCtfFIg+CdkzK9IxVdkzM=", + "pgrx": "0.11.3", + "rust": "1.76.0" + }, + "0.4.2": { + "postgresql": [ + "15" + ], + "hash": "sha256-ut3IQED6ANXgabiHoEUdfSrwkuuYYSpRoeWdtBvSe64=", + "pgrx": "0.11.3", + "rust": "1.76.0" + }, "0.4.3": { "postgresql": [ "15" diff --git a/nix/ext/wrappers/default.nix b/nix/ext/wrappers/default.nix index a956cb184..620f3cba4 100644 --- a/nix/ext/wrappers/default.nix +++ b/nix/ext/wrappers/default.nix @@ -172,11 +172,6 @@ let } ); previouslyPackagedVersions = [ - "0.4.2" - "0.4.1" - "0.4.0" - "0.3.1" - "0.3.0" "0.2.0" "0.1.19" "0.1.18" From ca5ccd301b1ce4dc54a999dae38d310e088f138d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Roche?= Date: Fri, 10 Oct 2025 15:59:31 +0200 Subject: [PATCH 4/4] chore: add release suffix for testing --- ansible/vars.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ansible/vars.yml b/ansible/vars.yml index c30069929..37f939ebc 100644 --- a/ansible/vars.yml +++ b/ansible/vars.yml @@ -10,9 +10,9 @@ postgres_major: # Full version strings for each major version postgres_release: - postgresorioledb-17: "17.5.1.041-orioledb" - postgres17: "17.6.1.020" - postgres15: "15.14.1.020" + postgresorioledb-17: "17.5.1.041-orioledb-more-wrappers" + postgres17: "17.6.1.020-more-wrappers" + postgres15: "15.14.1.020-more-wrappers" # Non Postgres Extensions pgbouncer_release: 1.19.0