Author SHA1 Message Date
FloweyntandClaude Opus 4.6 091cd27af8 ci: log gitea API error responses
diff-pr / dix (pull_request) Successful in 6m29s
flake-check / flake-check (pull_request) Successful in 52s
lint / lint (pull_request) Successful in 1m49s
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_016tGMoEdMRnHsABmDbK3H7o
2026-09-11 20:55:44 +00:00
Floweynt ba23f719ab ci: fix vulnix GITHUB_OUTPUT format error
diff-pr / dix (pull_request) Successful in 6m30s
flake-check / flake-check (pull_request) Successful in 52s
lint / lint (pull_request) Successful in 1m50s
2026-09-11 15:25:03 -05:00
2 changed files with 15 additions and 4 deletions
+7
View File
@@ -1,10 +1,17 @@
{ lib, pkgs }: { 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 # tools must track ci.py's subprocess calls; nix stays ambient (uses the
# runner's own nix, not a pinned one). # runner's own nix, not a pinned one).
pkgs.writers.writePython3Bin "ci" { pkgs.writers.writePython3Bin "ci" {
flakeIgnore = [ "E501" ]; flakeIgnore = [ "E501" ];
libraries = [ pkgs.python3Packages.subprocess-tee ]; libraries = [ pkgs.python3Packages.subprocess-tee ];
makeWrapperArgs = [ makeWrapperArgs = [
"--set-default"
"NIX_USER_CONF_FILES"
(toString nixConf)
"--prefix" "--prefix"
"PATH" "PATH"
":" ":"
+8 -4
View File
@@ -18,7 +18,8 @@ def run(*args, **kw):
def nix(*args): 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): def git(*args, check=True):
@@ -32,8 +33,11 @@ def gitea(method, path, body=None):
req.add_header("Authorization", f'token {os.environ["GH_TOKEN"]}') req.add_header("Authorization", f'token {os.environ["GH_TOKEN"]}')
if data is not None: if data is not None:
req.add_header("Content-Type", "application/json") req.add_header("Content-Type", "application/json")
with urllib.request.urlopen(req) as resp: try:
raw = resp.read() with urllib.request.urlopen(req) as resp:
raw = resp.read()
except urllib.error.HTTPError as e:
sys.exit(f"gitea {method} {path}: {e.code} {e.reason}\n{e.read().decode()}")
return json.loads(raw) if raw else None return json.loads(raw) if raw else None
@@ -254,7 +258,7 @@ def format_vulnix(vulns):
def vulnix(args): def vulnix(args):
paths = list(build_hosts(args.ref).values()) 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): if result.returncode not in (0, 2):
print(result.stderr, file=sys.stderr) print(result.stderr, file=sys.stderr)
sys.exit(result.returncode) sys.exit(result.returncode)