@@ -84229,7 +84229,7 @@ drop table if exists DerivationOutputs;
84229
84229
84230
84230
create table DerivationOutputs
84231
84231
(
84232
- drv integer not null,
84232
+ drv integer not null, -- index of a path of a derivation in ValidPaths
84233
84233
id text not null, -- symbolic output id, usually "out"
84234
84234
path text not null,
84235
84235
primary key (drv, id),
@@ -84344,14 +84344,11 @@ from DerivationOutputs1;
84344
84344
-- Calculate updated derivation outputs for the second store
84345
84345
-- =====
84346
84346
84347
- -- drv | id | path
84347
+ -- drv | id | path | drvPath
84348
84348
drop view if exists DerivationIdPaths;
84349
84349
84350
-
84351
- -- TODO what is drv?
84352
-
84353
84350
create view DerivationIdPaths as
84354
- select drv, DerivationOutputs2.id, ValidPaths2_.path
84351
+ select drv, DerivationOutputs2.id, DerivationOutputs2.path, ValidPaths2_.path as drvPath
84355
84352
from DerivationOutputs2
84356
84353
join (select id, path from ValidPaths2) as ValidPaths2_ on ValidPaths2_.id = drv;
84357
84354
@@ -84360,9 +84357,9 @@ drop view if exists DerivationOutputs2Updated;
84360
84357
84361
84358
create view DerivationOutputs2Updated as
84362
84359
select ValidPaths_.drvNew as drv, id, DerivationIdPaths_.path
84363
- from (select id, path from DerivationIdPaths) as DerivationIdPaths_
84360
+ from (select id, path, drvPath from DerivationIdPaths) as DerivationIdPaths_
84364
84361
join (select id as drvNew, path from ValidPaths) as ValidPaths_
84365
- on DerivationIdPaths_.path = ValidPaths_.path;
84362
+ on DerivationIdPaths_.drvPath = ValidPaths_.path;
84366
84363
84367
84364
-- =====
84368
84365
-- Insert updated derivation outputs from the second store
@@ -84741,10 +84738,10 @@ function getInputAsArray(name, options) {
84741
84738
// https://github.com/NixOS/nix/blob/a047dec120672d00e069bacf10ffdda420fd1048/src/libutil/util.hh#L88
84742
84739
function parseNixGcMax(name, options) {
84743
84740
const input = core.getInput(name, options);
84744
- if (input.length == 0) {
84741
+ const chars = [...input];
84742
+ if (chars.length == 0) {
84745
84743
return undefined;
84746
84744
}
84747
- const chars = [...input];
84748
84745
let result = 0;
84749
84746
for (let i = 0; i < chars.length; i++) {
84750
84747
const char = chars[i];
@@ -84757,10 +84754,13 @@ function parseNixGcMax(name, options) {
84757
84754
switch (char) {
84758
84755
case "K":
84759
84756
result <<= 10;
84757
+ break;
84760
84758
case "M":
84761
84759
result <<= 20;
84760
+ break;
84762
84761
case "G":
84763
84762
result <<= 30;
84763
+ break;
84764
84764
default:
84765
84765
result = NaN;
84766
84766
}
0 commit comments