diff --git a/ofborg/src/outpaths.nix b/ofborg/src/outpaths.nix index 5656f3e..f22d730 100644 --- a/ofborg/src/outpaths.nix +++ b/ofborg/src/outpaths.nix @@ -5,24 +5,23 @@ let # Compromise: accuracy vs. resources needed for evaluation. { supportedSystems = [ - # Not ready to evaluate these archs, see #32365 - # "aarch64-linux" - # "i686-linux" + "aarch64-linux" + "i686-linux" "x86_64-linux" "x86_64-darwin" ]; + nixpkgsArgs = { config = { allowBroken = true; allowUnfree = true; allowInsecurePredicate = x: true; - checkMeta = false; # checkMeta; see #32365 + checkMeta = checkMeta; - # See https://github.com/NixOS/nixpkgs/pull/32365 handleEvalIssue = reason: errormsg: if reason == "unknown-meta" - then (builtins.trace (abort errormsg) true) - else (builtins.trace errormsg true); + then abort errormsg + else true; inHydra = true; }; diff --git a/ofborg/src/tagger.rs b/ofborg/src/tagger.rs index 557b92f..991f232 100644 --- a/ofborg/src/tagger.rs +++ b/ofborg/src/tagger.rs @@ -90,6 +90,8 @@ impl RebuildTagger { match attr.rsplit(".").next() { Some("x86_64-darwin") => { counter_darwin += 1; } Some("x86_64-linux") => { counter_linux += 1; } + Some("aarch64-linux") => { } + Some("i686-linux") => { } Some(arch) => { info!("Unknown arch: {:?}", arch); } None => { info!("Cannot grok attr: {:?}", attr); } } diff --git a/ofborg/src/tasks/massrebuilder.rs b/ofborg/src/tasks/massrebuilder.rs index 51fa3f0..3af419c 100644 --- a/ofborg/src/tasks/massrebuilder.rs +++ b/ofborg/src/tasks/massrebuilder.rs @@ -306,12 +306,11 @@ impl worker::SimpleWorker for MassRebuildWorker { ) .all(|status| status == Ok(())); - /* if eval_results { let mut status = CommitStatus::new( repo.statuses(), job.pr.head_sha.clone(), - String::from("Meta Field Checks"), + String::from("grahamcofborg-eval-check-meta"), String::from("config.nix: checkMeta = true"), None ); @@ -346,7 +345,6 @@ impl worker::SimpleWorker for MassRebuildWorker { status.set_url(gist_url); status.set(state.clone()); } - */ if eval_results { overall_status.set_with_description(