ci: fix vulnix GITHUB_OUTPUT format error
This commit is contained in:
@@ -1,10 +1,17 @@
|
||||
{ lib, pkgs }:
|
||||
let
|
||||
# vulnix's bundled nix-2.34 broke its own --experimental-features detection
|
||||
nixConf = pkgs.writeText "ci-nix.conf" "experimental-features = nix-command flakes";
|
||||
in
|
||||
# tools must track ci.py's subprocess calls; nix stays ambient (uses the
|
||||
# runner's own nix, not a pinned one).
|
||||
pkgs.writers.writePython3Bin "ci" {
|
||||
flakeIgnore = [ "E501" ];
|
||||
libraries = [ pkgs.python3Packages.subprocess-tee ];
|
||||
makeWrapperArgs = [
|
||||
"--set-default"
|
||||
"NIX_USER_CONF_FILES"
|
||||
(toString nixConf)
|
||||
"--prefix"
|
||||
"PATH"
|
||||
":"
|
||||
|
||||
@@ -18,7 +18,8 @@ def run(*args, **kw):
|
||||
|
||||
|
||||
def nix(*args):
|
||||
return subprocess_tee.run(("nix", "--extra-experimental-features", "nix-command flakes", "-L", *args), check=True, text=True).stdout
|
||||
# tee to stderr - stdout leaks into GITHUB_OUTPUT $() captures
|
||||
return subprocess_tee.run(("nix", "--extra-experimental-features", "nix-command flakes", "-L", *args), check=True, text=True, stdout=sys.stderr).stdout
|
||||
|
||||
|
||||
def git(*args, check=True):
|
||||
@@ -254,7 +255,7 @@ def format_vulnix(vulns):
|
||||
|
||||
def vulnix(args):
|
||||
paths = list(build_hosts(args.ref).values())
|
||||
result = run("vulnix", "-j", "-C", *paths, capture_output=True)
|
||||
result = run("vulnix", "-j", *paths, capture_output=True)
|
||||
if result.returncode not in (0, 2):
|
||||
print(result.stderr, file=sys.stderr)
|
||||
sys.exit(result.returncode)
|
||||
|
||||
Reference in New Issue
Block a user