Skip to content

Commit 6c81754

Browse files
authored
chore: set pg_graphql to stable rust (#1476)
* chore: set pg_graphql to stable rust * chore: handle ports per version in test * chore: pushed too soon. rm typo * chore: suffix for testing * chore: bump * chore: remove unnecessary build flag * chore: bump * chore: need to link wal-g v2 correctly * chore: bump * Chore: bump to release
1 parent 9eaaa41 commit 6c81754

File tree

3 files changed

+7
-8
lines changed

3 files changed

+7
-8
lines changed

ansible/tasks/setup-wal-g.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444

4545
- name: Create symlink to make wal-g-v2 the default wal-g
4646
ansible.builtin.file:
47-
src: /usr/local/bin/wal-g-v2
47+
src: /home/wal-g/.nix-profile/bin/wal-g-2
4848
dest: /usr/local/bin/wal-g
4949
state: link
5050
force: yes

ansible/vars.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ postgres_major:
88

99
# Full version strings for each major version
1010
postgres_release:
11-
postgresorioledb-17: "17.0.1.052-orioledb"
12-
postgres15: "15.8.1.059"
11+
postgresorioledb-17: "17.0.1.053-orioledb"
12+
postgres15: "15.8.1.060"
1313

1414
# Non Postgres Extensions
1515
pgbouncer_release: "1.19.0"

nix/ext/pg_graphql.nix

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{ lib, stdenv, fetchFromGitHub, postgresql, buildPgrxExtension_0_12_9, cargo, rust-bin }:
22

33
let
4-
rustVersion = "nightly";
5-
cargo = rust-bin.nightly.latest.default;
4+
rustVersion = "1.81.0";
5+
cargo = rust-bin.stable.${rustVersion}.default;
66
in
77
buildPgrxExtension_0_12_9 rec {
88
pname = "pg_graphql";
@@ -27,12 +27,11 @@ buildPgrxExtension_0_12_9 rec {
2727
# Setting RUSTFLAGS in env to ensure it's available for all phases
2828
env = lib.optionalAttrs stdenv.isDarwin {
2929
POSTGRES_LIB = "${postgresql}/lib";
30-
PGPORT = "5434";
30+
PGPORT = if (lib.versions.major postgresql.version) == "17" then "5440" else "5439";
3131
RUSTFLAGS = "-C link-arg=-undefined -C link-arg=dynamic_lookup";
3232
NIX_BUILD_CORES = "4"; # Limit parallel jobs
3333
CARGO_BUILD_JOBS = "4"; # Limit cargo parallelism
3434
};
35-
CARGO_BUILD_RUSTFLAGS = "--cfg tokio_unstable -C debuginfo=0";
3635
CARGO_PROFILE_RELEASE_BUILD_OVERRIDE_DEBUG = true;
3736

3837

@@ -45,4 +44,4 @@ CARGO_BUILD_RUSTFLAGS = "--cfg tokio_unstable -C debuginfo=0";
4544
platforms = postgresql.meta.platforms;
4645
license = licenses.postgresql;
4746
};
48-
}
47+
}

0 commit comments

Comments
 (0)