grahamc/hydra - Change O4QHGXYIVGJVSI52EMSROPKZ7RSQ4MU4PZHPBHHFNBR7G3E7GEAQC

hydra-eval-jobset: Fix two minor bugs

I'm honestly too lazy to create two commits for fixing these one-line issues so here's one.

The first hunk fixes the name of the projectName input. This is relevant now because it gets logged and the log message looks stupid when there is an input without a name.

The second hunk fixes a warning when using declarative non-flake jobsets. The implementation may look weird but it's just the same as the logical implication operator of nix.

Created by Janne Heß on January 10, 2022

O4QHGXYIVGJVSI52EMSROPKZ7RSQ4MU4PZHPBHHFNBR7G3E7GEAQC

Dependencies

In channels

main

upstream

Change contents

Replacement in src/script/hydra-eval-jobset at line 610 [4.1319]

B:BD[3.4666] → [2.0:129]

                $inputInfo->{"projectName"} = [ fetchInput($plugins, $db, $project, $jobset, "", "string", $project->name, 0) ];

[3.4666]

[5.341]

                $inputInfo->{"projectName"} = [ fetchInput($plugins, $db, $project, $jobset, "projectName", "string", $project->name, 0) ];

Replacement in src/script/hydra-eval-jobset at line 655 [4.1319]

B:BD[6.55] → [7.725:854]

    if (defined $prevEval && $prevEval->hash eq $argsHash && !$dryRun && !$jobset->forceeval && $prevEval->flake eq $flakeRef) {

[6.55]

[8.1961]

    if (defined $prevEval && $prevEval->hash eq $argsHash && !$dryRun && !$jobset->forceeval && (!defined($flakeRef) || ($prevEval->flake eq $flakeRef))) {