Skip to content

Commit 7f319cd

Browse files
committed
feat: build pg_graphql and pg_jsonschema extension packages separately in CI
To be able to build extensions versions packages separately in CI, we expose them in a nested structure. We did this change in the past for wrappers packages. Now we do the same for pg_graphql and pg_jsonschema extension packages.
1 parent cdb8dad commit 7f319cd

File tree

2 files changed

+18
-6
lines changed

2 files changed

+18
-6
lines changed

nix/ext/pg_graphql/default.nix

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,9 +125,11 @@ let
125125
versions = lib.naturalSort (lib.attrNames supportedVersions);
126126
latestVersion = lib.last versions;
127127
numberOfVersions = builtins.length versions;
128-
packages = builtins.attrValues (
129-
lib.mapAttrs (name: value: build name value.hash value.rust value.pgrx) supportedVersions
130-
);
128+
packagesAttrSet = lib.mapAttrs' (name: value: {
129+
name = lib.replaceStrings [ "." ] [ "_" ] name;
130+
value = build name value.hash value.rust value.pgrx;
131+
}) supportedVersions;
132+
packages = builtins.attrValues packagesAttrSet;
131133
in
132134
(buildEnv {
133135
name = pname;
@@ -175,6 +177,10 @@ in
175177
inherit versions numberOfVersions pname;
176178
version =
177179
"multi-" + lib.concatStringsSep "-" (map (v: lib.replaceStrings [ "." ] [ "-" ] v) versions);
180+
# Expose individual packages for CI to build separately
181+
packages = packagesAttrSet // {
182+
recurseForDerivations = true;
183+
};
178184
};
179185
}).overrideAttrs
180186
(_: {

nix/ext/pg_jsonschema/default.nix

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -126,9 +126,11 @@ let
126126
versions = lib.naturalSort (lib.attrNames supportedVersions);
127127
latestVersion = lib.last versions;
128128
numberOfVersions = builtins.length versions;
129-
packages = builtins.attrValues (
130-
lib.mapAttrs (name: value: build name value.hash value.rust value.pgrx) supportedVersions
131-
);
129+
packagesAttrSet = lib.mapAttrs' (name: value: {
130+
name = lib.replaceStrings [ "." ] [ "_" ] name;
131+
value = build name value.hash value.rust value.pgrx;
132+
}) supportedVersions;
133+
packages = builtins.attrValues packagesAttrSet;
132134
in
133135
(pkgs.buildEnv {
134136
name = pname;
@@ -168,6 +170,10 @@ in
168170
inherit versions numberOfVersions pname;
169171
version =
170172
"multi-" + lib.concatStringsSep "-" (map (v: lib.replaceStrings [ "." ] [ "-" ] v) versions);
173+
# Expose individual packages for CI to build separately
174+
packages = packagesAttrSet // {
175+
recurseForDerivations = true;
176+
};
171177
};
172178
}).overrideAttrs
173179
(_: {

0 commit comments

Comments
 (0)