Skip to content

Commit 75c8517

Browse files
burmeciasamrosejfroche
authored
chore: bump Wrappers version to 0.5.7 (#1945)
* chore: bump Wrappers version to 0.5.7 * add new pgrx and rust version * feat: support 1.88 rust 0.16.1 pgrx 0.57 wrappers * docs: update docs * fix: reduce pressure on CI runners Updating the dependency helping us build all our rust extensions has put a lot of pressure on our CI runners, causing timeouts and failed builds. We are currently working on a more permanent solution in #1745 but in the meantime, we cap the number of parallel nix builds to 2, which should reduce the load on our CI runners. * fix: pg_regress test for wrappers extension pg_regress tests always test the latest update of our extensions. Add the wrappers renamed types to the expected output files. * fix: increase parallelism for build process We have reduced the pressure on CI runner, now the build process is timing out after 3h. By increasing the parallelism from 2 to 4, we can better utilize the available resources and speed up the build process without overwhelming the system like before. * fix: delegate copying artifacts to nix-fast-build Copying built artifacts to S3 should be done by nix-fast-build itself while building instead of relying on nix-daemon's post-build hooks and the end of the build. * chore: bump to release --------- Co-authored-by: Sam Rose <[email protected]> Co-authored-by: Jean-François Roche <[email protected]>
1 parent 6b3b5c7 commit 75c8517

File tree

15 files changed

+427
-28
lines changed

15 files changed

+427
-28
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,4 +44,4 @@ runs:
4444
substituters = https://cache.nixos.org https://nix-postgres-artifacts.s3.amazonaws.com
4545
trusted-public-keys = nix-postgres-artifacts:dGZlQOvKcNEjvT7QEAJbcV6b6uk7VF/hWMjhYleiaLI= cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=
4646
${{ inputs.push-to-cache == 'true' && 'post-build-hook = /etc/nix/upload-to-cache.sh' || '' }}
47-
max-jobs = 8
47+
max-jobs = 4

.github/workflows/nix-build.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
fail-fast: false
2525
matrix:
2626
include:
27-
- runner: blacksmith-32vcpu-ubuntu-2404
27+
- runner: blacksmith-32vcpu-ubuntu-2404
2828
arch: amd64
2929
- runner: blacksmith-32vcpu-ubuntu-2404-arm
3030
arch: arm64
@@ -66,11 +66,11 @@ jobs:
6666
sudo rm -rf /tmp/* 2>/dev/null || true
6767
echo "=== AFTER CLEANUP ==="
6868
df -h
69-
-
69+
-
7070
name: Build psql bundle
7171
run: >
72-
nix run "github:Mic92/nix-fast-build?rev=b1dae483ab7d4139a6297e02b6de9e5d30e43d48"
73-
-- --skip-cached --no-nom ${{ matrix.runner == 'macos-latest-xlarge' && '--max-jobs 1' || '' }}
72+
nix run "github:Mic92/nix-fast-build?rev=b1dae483ab7d4139a6297e02b6de9e5d30e43d48"
73+
-- --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"
7474
--flake ".#checks.$(nix eval --raw --impure --expr 'builtins.currentSystem')"
7575
env:
7676
AWS_ACCESS_KEY_ID: ${{ env.AWS_ACCESS_KEY_ID }}

Dockerfile-15

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ ARG pg_repack_release=1.4.8
3030
ARG vault_release=0.2.8
3131
ARG groonga_release=12.0.8
3232
ARG pgroonga_release=2.4.0
33-
ARG wrappers_release=0.5.6
33+
ARG wrappers_release=0.5.7
3434
ARG hypopg_release=1.3.1
3535
ARG pgvector_release=0.4.0
3636
ARG pg_tle_release=1.3.2

Dockerfile-17

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ ARG pg_repack_release=1.4.8
3131
ARG vault_release=0.2.8
3232
ARG groonga_release=12.0.8
3333
ARG pgroonga_release=2.4.0
34-
ARG wrappers_release=0.5.6
34+
ARG wrappers_release=0.5.7
3535
ARG hypopg_release=1.3.1
3636
ARG pgvector_release=0.4.0
3737
ARG pg_tle_release=1.3.2

Dockerfile-orioledb-17

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ ARG pg_repack_release=1.4.8
3131
ARG vault_release=0.2.8
3232
ARG groonga_release=12.0.8
3333
ARG pgroonga_release=2.4.0
34-
ARG wrappers_release=0.5.6
34+
ARG wrappers_release=0.5.7
3535
ARG hypopg_release=1.3.1
3636
ARG pgvector_release=0.4.0
3737
ARG pg_tle_release=1.3.2

ansible/vars.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ postgres_major:
1010

1111
# Full version strings for each major version
1212
postgres_release:
13-
postgresorioledb-17: "17.6.0.013-orioledb"
14-
postgres17: "17.6.1.056"
15-
postgres15: "15.14.1.056"
13+
postgresorioledb-17: "17.6.0.014-orioledb"
14+
postgres17: "17.6.1.057"
15+
postgres15: "15.14.1.057"
1616

1717
# Non Postgres Extensions
1818
pgbouncer_release: 1.19.0

flake.lock

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

nix/cargo-pgrx/versions.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,14 @@
107107
"cargoHash": "sha256-pK6OxRNubcWhohLvIJIliRtaHSIQOhQp7Q9brPygZYA="
108108
}
109109
}
110+
},
111+
"0.16.1": {
112+
"hash": "sha256-AjoBr+/sEPdzbD0wLUNVm2syCySkGaFOFQ70TST1U9w=",
113+
"rust": {
114+
"1.88.0": {
115+
"cargoHash": "sha256-uWj/V2lJa6HF2GlHX+i5RbSMZFOxZsBzOf6okKDb0j8="
116+
}
117+
}
110118
}
111119

112120
}

nix/docs/update-extension.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
There are two types of extension package structures in our codebase:
77

8-
1. **Old structure (deprecated, soon to be replaced)**: Extensions like `supautils.nix` that directly define a single version
8+
1. **Old structure (deprecated)**: Extensions like `supautils.nix` that directly define a single version in the nix expression for the package
99
2. **New structure (current standard)**: Extensions that load multiple versions from `nix/ext/versions.json`
1010

1111
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
143143

144144
10. **Once approved**: Update `common-nix.vars.yml` if releasing
145145

146+
> **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.
147+
146148
---
147149

148150
## Updating an Extension (Old Structure - Deprecated)

0 commit comments

Comments
 (0)