chore: cover installing both versions of wal-g 2 and 3 2 as default

Author: samrose

ansible/vars.yml

@@ -8,8 +8,8 @@ postgres_major:
 
 # Full version strings for each major version
 postgres_release:
-  postgresorioledb-17: "17.0.1.049-orioledb"
-  postgres15: "15.8.1.056"
+  postgresorioledb-17: "17.0.1.050-orioledb-walg"
+  postgres15: "15.8.1.057-walg"
 
 # Non Postgres Extensions
 pgbouncer_release: "1.19.0"

docker/nix/build_nix.sh

@@ -10,12 +10,14 @@ SYSTEM=$(nix-instantiate --eval -E builtins.currentSystem | tr -d '"')
 
 nix build .#checks.$SYSTEM.psql_15 -L --no-link
 nix build .#checks.$SYSTEM.psql_orioledb-17 -L --no-link
-nix build .#psql_15/bin -o psql_15
+nix build .#psql_15/bin -o psql_15 -L
 
-nix build .#psql_orioledb-17/bin -o psql_orioledb_17
-nix build .#wal-g -o wal-g
+nix build .#psql_orioledb-17/bin -o psql_orioledb_17 -L
+nix build .#wal-g -o wal-g -L
+nix build .#wal-g-3 -o wal-g-3 -L
 # Copy to S3
 nix copy --to s3://nix-postgres-artifacts?secret-key=nix-secret-key ./wal-g
+nix copy --to s3://nix-postgres-artifacts?secret-key=nix-secret-key ./wal-g-3
 nix copy --to s3://nix-postgres-artifacts?secret-key=nix-secret-key ./psql_15
 nix copy --to s3://nix-postgres-artifacts?secret-key=nix-secret-key ./psql_orioledb_17
 if [ "$SYSTEM" = "aarch64-linux" ]; then
@@ -27,5 +29,4 @@ if [ "$SYSTEM" = "aarch64-linux" ]; then
     nix copy --to s3://nix-postgres-artifacts?secret-key=nix-secret-key  ./postgresql_15_src
     nix copy --to s3://nix-postgres-artifacts?secret-key=nix-secret-key ./postgresql_orioledb-17_debug-debug
     nix copy --to s3://nix-postgres-artifacts?secret-key=nix-secret-key  ./postgresql_orioledb-17_src
-    nix copy --to s3://nix-postgres-artifacts?secret-key=nix-secret-key  ./wal-g
 fi

flake.nix

@@ -87,7 +87,7 @@
         sfcgal = pkgs.callPackage ./nix/ext/sfcgal/sfcgal.nix { };
         supabase-groonga = pkgs.callPackage ./nix/supabase-groonga.nix { };
         mecab-naist-jdic = pkgs.callPackage ./nix/ext/mecab-naist-jdic/default.nix { };
-        wal-g = pkgs.callPackage ./nix/wal-g.nix { };
+        inherit (pkgs.callPackage ./nix/wal-g.nix { }) wal-g wal-g-3;
         # Our list of PostgreSQL extensions which come from upstream Nixpkgs.
         # These are maintained upstream and can easily be used here just by
         # listing their name. Anytime the version of nixpkgs is upgraded, these
@@ -407,6 +407,7 @@
           psql_15 = postgresVersions.psql_15;
           psql_orioledb-17 = postgresVersions.psql_orioledb-17;
           wal-g = wal-g;
+          wal-g-3 = wal-g-3;
           sfcgal = sfcgal;
           pg_prove = pkgs.perlPackages.TAPParserSourceHandlerpgTAP;
           inherit postgresql_15 postgresql_orioledb-17;