Merge remote-tracking branch 'origin/develop' into INDATA-257

* origin/develop:
  chore: bump Wrappers version to 0.5.7 (#1945)

Author: hunleyd

.github/actions/nix-install-ephemeral/action.yml

@@ -44,4 +44,4 @@ runs:
           substituters = https://cache.nixos.org https://nix-postgres-artifacts.s3.amazonaws.com
           trusted-public-keys = nix-postgres-artifacts:dGZlQOvKcNEjvT7QEAJbcV6b6uk7VF/hWMjhYleiaLI= cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=
           ${{ inputs.push-to-cache == 'true' && 'post-build-hook = /etc/nix/upload-to-cache.sh' || '' }}
-          max-jobs = 8
+          max-jobs = 4

.github/workflows/nix-build.yml

@@ -24,7 +24,7 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - runner: blacksmith-32vcpu-ubuntu-2404	
+          - runner: blacksmith-32vcpu-ubuntu-2404
             arch: amd64
           - runner: blacksmith-32vcpu-ubuntu-2404-arm
             arch: arm64
@@ -66,11 +66,11 @@ jobs:
           sudo rm -rf /tmp/* 2>/dev/null || true
           echo "=== AFTER CLEANUP ==="
           df -h
-      - 
+      -
         name: Build psql bundle
         run: >
-          nix run "github:Mic92/nix-fast-build?rev=b1dae483ab7d4139a6297e02b6de9e5d30e43d48" 
-          -- --skip-cached --no-nom ${{ matrix.runner == 'macos-latest-xlarge' && '--max-jobs 1' || '' }}
+          nix run "github:Mic92/nix-fast-build?rev=b1dae483ab7d4139a6297e02b6de9e5d30e43d48"
+          -- --skip-cached --no-nom ${{ matrix.runner == 'macos-latest-xlarge' && '--max-jobs 1' || '' }} --copy-to "s3://nix-postgres-artifacts?secret-key=/etc/nix/nix-secret-key"
           --flake ".#checks.$(nix eval --raw --impure --expr 'builtins.currentSystem')"
         env:
           AWS_ACCESS_KEY_ID: ${{ env.AWS_ACCESS_KEY_ID }}

Dockerfile-15

@@ -30,7 +30,7 @@ ARG pg_repack_release=1.4.8
 ARG vault_release=0.2.8
 ARG groonga_release=12.0.8
 ARG pgroonga_release=2.4.0
-ARG wrappers_release=0.5.6
+ARG wrappers_release=0.5.7
 ARG hypopg_release=1.3.1
 ARG pgvector_release=0.4.0
 ARG pg_tle_release=1.3.2

Dockerfile-17

@@ -31,7 +31,7 @@ ARG pg_repack_release=1.4.8
 ARG vault_release=0.2.8
 ARG groonga_release=12.0.8
 ARG pgroonga_release=2.4.0
-ARG wrappers_release=0.5.6
+ARG wrappers_release=0.5.7
 ARG hypopg_release=1.3.1
 ARG pgvector_release=0.4.0
 ARG pg_tle_release=1.3.2

Dockerfile-orioledb-17

@@ -31,7 +31,7 @@ ARG pg_repack_release=1.4.8
 ARG vault_release=0.2.8
 ARG groonga_release=12.0.8
 ARG pgroonga_release=2.4.0
-ARG wrappers_release=0.5.6
+ARG wrappers_release=0.5.7
 ARG hypopg_release=1.3.1
 ARG pgvector_release=0.4.0
 ARG pg_tle_release=1.3.2

ansible/vars.yml

@@ -10,9 +10,9 @@ postgres_major:
 
 # Full version strings for each major version
 postgres_release:
-  postgresorioledb-17: "17.6.0.013-orioledb-INDATA-257"
-  postgres17: "17.6.1.056-INDATA-257"
-  postgres15: "15.14.1.056-INDATA-257"
+  postgresorioledb-17: "17.6.0.014-orioledb-INDATA257"
+  postgres17: "17.6.1.057-INDATA257"
+  postgres15: "15.14.1.057-INDATA257"
 
 # Non Postgres Extensions
 pgbouncer_release: 1.19.0

flake.lock

@@ -107,6 +107,14 @@
         "cargoHash": "sha256-pK6OxRNubcWhohLvIJIliRtaHSIQOhQp7Q9brPygZYA="
       }
     }
+  },
+  "0.16.1": {
+    "hash": "sha256-AjoBr+/sEPdzbD0wLUNVm2syCySkGaFOFQ70TST1U9w=",
+    "rust": {
+      "1.88.0": {
+        "cargoHash": "sha256-uWj/V2lJa6HF2GlHX+i5RbSMZFOxZsBzOf6okKDb0j8="
+      }
+    }
   }
 
 }

nix/cargo-pgrx/versions.json

@@ -5,7 +5,7 @@
 
 There are two types of extension package structures in our codebase:
 
-1. **Old structure (deprecated, soon to be replaced)**: Extensions like `supautils.nix` that directly define a single version
+1. **Old structure (deprecated)**: Extensions like `supautils.nix` that directly define a single version in the nix expression for the package
 2. **New structure (current standard)**: Extensions that load multiple versions from `nix/ext/versions.json`
 
 Most extensions now use the new structure, which supports multiple versions via the `versions.json` file. The instructions below cover both approaches.
@@ -143,6 +143,8 @@ These extensions use `mkPgrxExtension` and require additional Rust and pgrx vers
 
 10. **Once approved**: Update `common-nix.vars.yml` if releasing
 
+> **Need to update pgrx or Rust versions?** See [Updating cargo-pgrx Extensions](./updating-pgrx-extensions.md) for the complete guide covering pgrx version updates, Rust toolchain updates (including `nix flake update rust-overlay`), and troubleshooting.
+
 ---
 
 ## Updating an Extension (Old Structure - Deprecated)