Skip to content

Commit dd9bf74

Browse files
jfrocheyvan-sraka
authored andcommitted
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 ba1f12c commit dd9bf74

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
@@ -132,9 +132,11 @@ let
132132
supportedVersions;
133133
versionsBuilt = if latestOnly then [ latestVersion ] else versions;
134134
numberOfVersionsBuilt = builtins.length versionsBuilt;
135-
packages = builtins.attrValues (
136-
lib.mapAttrs (name: value: build name value.hash value.rust value.pgrx) versionsToUse
137-
);
135+
packagesAttrSet = lib.mapAttrs' (name: value: {
136+
name = lib.replaceStrings [ "." ] [ "_" ] name;
137+
value = build name value.hash value.rust value.pgrx;
138+
}) versionsToUse;
139+
packages = builtins.attrValues packagesAttrSet;
138140
in
139141
(buildEnv {
140142
name = pname;
@@ -187,6 +189,10 @@ in
187189
latestVersion
188190
else
189191
"multi-" + lib.concatStringsSep "-" (map (v: lib.replaceStrings [ "." ] [ "-" ] v) versions);
192+
# Expose individual packages for CI to build separately
193+
packages = packagesAttrSet // {
194+
recurseForDerivations = true;
195+
};
190196
};
191197
}).overrideAttrs
192198
(_: {

nix/ext/pg_jsonschema/default.nix

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -137,9 +137,11 @@ let
137137
{ "${latestVersion}" = supportedVersions.${latestVersion}; }
138138
else
139139
supportedVersions;
140-
packages = builtins.attrValues (
141-
lib.mapAttrs (name: value: build name value.hash value.rust value.pgrx) versionsToUse
142-
);
140+
packagesAttrSet = lib.mapAttrs' (name: value: {
141+
name = lib.replaceStrings [ "." ] [ "_" ] name;
142+
value = build name value.hash value.rust value.pgrx;
143+
}) versionsToUse;
144+
packages = builtins.attrValues packagesAttrSet;
143145
versionsBuilt = if latestOnly then [ latestVersion ] else versions;
144146
numberOfVersionsBuilt = builtins.length versionsBuilt;
145147
in
@@ -186,6 +188,10 @@ in
186188
latestVersion
187189
else
188190
"multi-" + lib.concatStringsSep "-" (map (v: lib.replaceStrings [ "." ] [ "-" ] v) versions);
191+
# Expose individual packages for CI to build separately
192+
packages = packagesAttrSet // {
193+
recurseForDerivations = true;
194+
};
189195
};
190196
}).overrideAttrs
191197
(_: {

0 commit comments

Comments
 (0)