Compare commits
1 Commits
bd668ad109
...
4cebcf2b12
| Author | SHA1 | Date | |
|---|---|---|---|
|
4cebcf2b12 |
12
flake.lock
generated
12
flake.lock
generated
@ -57,11 +57,11 @@
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1743039536,
|
||||
"narHash": "sha256-O3GFPU0Uyv80LKVMMukVqrfxSzWKkBwQIHN2UnRSCZk=",
|
||||
"lastModified": 1742960832,
|
||||
"narHash": "sha256-xdp71QH76Q0esAJi4+5xDzpgBQNFpq8xn6UNfyT/s9w=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "0ab4a506520ea9247e673e9849ecf84c72f88be2",
|
||||
"rev": "24693557f72603e8f2c514ee26854d5c2aad9090",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -174,11 +174,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1743057427,
|
||||
"narHash": "sha256-dgohGOVoIju52AC1czMjRfAEqf9LZZSRpxZ3ekclEak=",
|
||||
"lastModified": 1742975782,
|
||||
"narHash": "sha256-0b0I1E/WjZjkWPxb+BtVUxI3uxlu8DIdbPWW5WvzAZ0=",
|
||||
"owner": "pyproject-nix",
|
||||
"repo": "uv2nix",
|
||||
"rev": "f5b0ec1f303c16e5819694f8f5185814177dacb2",
|
||||
"rev": "edc060c2f299dbd2c55f23b9a1e9b2eb874929d0",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
||||
@ -11,7 +11,6 @@ from flupdt.common import bash_wrapper
|
||||
drv_re = re.compile(r".*(/nix/store/.*\.drv).*")
|
||||
|
||||
OUTPUT_DIR = mkdtemp(prefix="flupdt-outputs-")
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
def build_output(path: str, output: str) -> str | None:
|
||||
@ -21,16 +20,16 @@ def build_output(path: str, output: str) -> str | None:
|
||||
:param output: flake output to be built
|
||||
:returns the .drv path on success or None on failure
|
||||
"""
|
||||
logger.info(f"build {output}")
|
||||
logger.debug(f"outputting to {OUTPUT_DIR}/{output}.nixoutput")
|
||||
logging.info(f"build {output}")
|
||||
logging.debug(f"outputting to {OUTPUT_DIR}/{output}.nixoutput")
|
||||
out = bash_wrapper(f"nix build {path}#{output} -o {OUTPUT_DIR}/{output}.nixoutput")
|
||||
logger.debug("output")
|
||||
logger.debug(out[0])
|
||||
logger.debug("error")
|
||||
logger.debug(out[1])
|
||||
logger.debug("statuscode")
|
||||
logger.debug(out[2])
|
||||
logging.debug("output")
|
||||
logging.debug(out[0])
|
||||
logging.debug("error")
|
||||
logging.debug(out[1])
|
||||
logging.debug("statuscode")
|
||||
logging.debug(out[2])
|
||||
if out[2] != 0:
|
||||
logger.warning(f"output {output} did not build correctly")
|
||||
logging.warning(f"output {output} did not build correctly")
|
||||
return None
|
||||
return ""
|
||||
|
||||
@ -5,8 +5,6 @@ import shutil
|
||||
|
||||
from flupdt.common import bash_wrapper
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
def compare_derivations(
|
||||
path_to_flake: str, path_to_pre_drv: str, path_to_post_drv: str, *, soft_failure: bool = True
|
||||
@ -26,10 +24,10 @@ def compare_derivations(
|
||||
)
|
||||
|
||||
if returncode != 0:
|
||||
log_func = logger.error
|
||||
log_func = logging.error
|
||||
if soft_failure:
|
||||
log_func = logger.warning
|
||||
logger.warning(f"diff failed for {path_to_pre_drv} and {path_to_post_drv}")
|
||||
log_func = logging.warning
|
||||
logging.warning(f"diff failed for {path_to_pre_drv} and {path_to_post_drv}")
|
||||
log_func(stderr)
|
||||
|
||||
return stdout
|
||||
|
||||
@ -9,8 +9,6 @@ from flupdt.common import bash_wrapper
|
||||
|
||||
drv_re = re.compile(r".*(/nix/store/.*\.drv).*")
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
def evaluate_output(path: str, output: str) -> str | None:
|
||||
"""Evaluates a given output in a flake.
|
||||
@ -20,19 +18,19 @@ def evaluate_output(path: str, output: str) -> str | None:
|
||||
:returns the .drv path on success or None on failure
|
||||
:raises RuntimeError: evaluation succeeds but no derivation is found
|
||||
"""
|
||||
logger.info(f"evaluating {output}")
|
||||
logging.info(f"evaluating {output}")
|
||||
out = bash_wrapper(f"nix eval {path}#{output}")
|
||||
logger.debug(out[0])
|
||||
logger.debug(out[1])
|
||||
logger.debug(out[2])
|
||||
logging.debug(out[0])
|
||||
logging.debug(out[1])
|
||||
logging.debug(out[2])
|
||||
if out[2] != 0:
|
||||
logger.warning(f"output {output} did not evaluate correctly")
|
||||
logging.warning(f"output {output} did not evaluate correctly")
|
||||
return None
|
||||
drv_match = drv_re.match(out[0])
|
||||
if drv_match is None:
|
||||
out_msg = "derivation succeeded but output derivation does not contain a derivation"
|
||||
raise RuntimeError(out_msg)
|
||||
drv = drv_match.group(1)
|
||||
logger.debug(f"derivation evaluated to {drv}")
|
||||
logging.debug(f"derivation evaluated to {drv}")
|
||||
|
||||
return drv
|
||||
|
||||
@ -12,7 +12,6 @@ output_regexes = [
|
||||
re.compile(r"checking derivation (.*)..."),
|
||||
re.compile(r"checking NixOS configuration \'(nixosConfigurations.*)\'\.\.\."),
|
||||
]
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
def traverse_json_base(json_dict: dict[str, typing.Any], path: list[str]) -> list[str]:
|
||||
@ -55,7 +54,7 @@ def get_derivations_from_check(nix_path: str, path_to_flake: str) -> list[str]:
|
||||
"""
|
||||
flake_check = bash_wrapper(f"{nix_path} flake check --verbose --keep-going", path=path_to_flake)
|
||||
if flake_check[2] != 0:
|
||||
logger.warning(
|
||||
logging.warning(
|
||||
"nix flake check returned non-zero exit code, collecting all available outputs"
|
||||
)
|
||||
error_out = flake_check[1].split("\n")
|
||||
@ -63,10 +62,10 @@ def get_derivations_from_check(nix_path: str, path_to_flake: str) -> list[str]:
|
||||
derivations = []
|
||||
for output in possible_outputs:
|
||||
for r in output_regexes:
|
||||
logger.debug(f"{output} {r.pattern}")
|
||||
logging.debug(f"{output} {r.pattern}")
|
||||
match = r.match(output)
|
||||
if match is not None:
|
||||
logger.debug(match.groups())
|
||||
logging.debug(match.groups())
|
||||
derivations += [match.groups()[0]]
|
||||
return derivations
|
||||
|
||||
@ -85,8 +84,8 @@ def get_derivations(path_to_flake: str) -> list[str]:
|
||||
raise RuntimeError(status_msg)
|
||||
flake_show = bash_wrapper(f"{nix_path} flake show --json", path=path_to_flake)
|
||||
if flake_show[2] != 0:
|
||||
logger.error("flake show returned non-zero exit code")
|
||||
logger.warning("falling back to full evaluation via nix flake check")
|
||||
logging.error("flake show returned non-zero exit code")
|
||||
logging.warning("falling back to full evaluation via nix flake check")
|
||||
derivations = get_derivations_from_check(nix_path, path_to_flake)
|
||||
else:
|
||||
flake_show_json = json.loads(flake_show[0])
|
||||
|
||||
@ -4,7 +4,6 @@
|
||||
|
||||
import logging
|
||||
import os
|
||||
import sys
|
||||
from argparse import Namespace
|
||||
from pathlib import Path
|
||||
|
||||
@ -15,8 +14,6 @@ from flupdt.flake_diff import compare_derivations
|
||||
from flupdt.flake_eval import evaluate_output
|
||||
from flupdt.flake_show import get_derivations
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
def batch_eval(args: Namespace, flake_path: str, derivations: list[str]) -> None:
|
||||
"""Bulk run evaluations or builds on a derivation set.
|
||||
@ -31,14 +28,12 @@ def batch_eval(args: Namespace, flake_path: str, derivations: list[str]) -> None
|
||||
if args.evaluate:
|
||||
drv_map[d] = evaluate_output(flake_path, d)
|
||||
if args.build:
|
||||
drv_map[d] = build_output(flake_path, d)
|
||||
build_output(flake_path, d)
|
||||
if args.json:
|
||||
with Path.open(args.json, "w+") as f:
|
||||
from json import dump
|
||||
|
||||
dump(drv_map, f)
|
||||
if any(x is None for x in drv_map.values()):
|
||||
sys.exit(1)
|
||||
|
||||
|
||||
def compare_drvs(args: Namespace) -> None:
|
||||
@ -57,8 +52,8 @@ def compare_drvs(args: Namespace) -> None:
|
||||
pre_json_dict = load(pre)
|
||||
post_json_dict = load(post)
|
||||
|
||||
logger.debug(f"pre-snapshot derivations: {pre_json_dict}")
|
||||
logger.debug(f"post-snapshot derivations: {post_json_dict}")
|
||||
logging.debug(f"pre-snapshot derivations: {pre_json_dict}")
|
||||
logging.debug(f"post-snapshot derivations: {post_json_dict}")
|
||||
|
||||
pre_json_keys = set(pre_json_dict.keys())
|
||||
post_json_keys = set(post_json_dict.keys())
|
||||
@ -69,11 +64,11 @@ def compare_drvs(args: Namespace) -> None:
|
||||
missing_pre_keys = post_json_keys.difference(common_keys_to_eval)
|
||||
|
||||
if missing_pre_keys:
|
||||
logger.warning(f"Following outputs are missing from pre-snapshot: {missing_pre_keys}")
|
||||
logging.warning(f"Following outputs are missing from pre-snapshot: {missing_pre_keys}")
|
||||
if missing_post_keys:
|
||||
logger.warning(f"Following outputs are missing from post-snapshot: {missing_post_keys}")
|
||||
logging.warning(f"Following outputs are missing from post-snapshot: {missing_post_keys}")
|
||||
|
||||
logger.info(f"Evaluating the following outputs for differences: {common_keys_to_eval}")
|
||||
logging.info(f"Evaluating the following outputs for differences: {common_keys_to_eval}")
|
||||
|
||||
out_file: str = os.devnull
|
||||
if args.compare_output_to_file:
|
||||
@ -102,11 +97,11 @@ def build_or_eval(args: Namespace) -> None:
|
||||
lambda s: s.startswith("hydraJobs"), get_derivations(flake_path)
|
||||
)
|
||||
derivations, hydra_jobs = list(derivations), list(hydra_jobs)
|
||||
logger.info(f"derivations: {list(derivations)}")
|
||||
logging.info(f"derivations: {list(derivations)}")
|
||||
batch_eval(args, flake_path, derivations)
|
||||
|
||||
if not args.keep_hydra:
|
||||
logger.info("--keep-hydra flag is not specified, removing Hydra jobs")
|
||||
logging.info("--keep-hydra flag is not specified, removing Hydra jobs")
|
||||
else:
|
||||
batch_eval(args, flake_path, hydra_jobs)
|
||||
|
||||
@ -117,7 +112,7 @@ def main() -> None:
|
||||
:returns: None
|
||||
|
||||
"""
|
||||
configure_logger("INFO")
|
||||
configure_logger("DEBUG")
|
||||
args = parse_inputs()
|
||||
if args.compare_drvs:
|
||||
compare_drvs(args)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user