danderson/ofborg
0
0
Fork 0
forked from the-distro/ofborg
Code Pull requests Activity

Merge pull request #21 from grahamc/meta-check

Browse source 
Resume meta checks
This commit is contained in:
Graham Christensen 2017-12-14 08:04:55 -05:00 committed by GitHub
commit 7a7f6817ea
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
ofborg/src/outpaths.nix
View file

@ -5,24 +5,23 @@ let
# Compromise: accuracy vs. resources needed for evaluation. # Compromise: accuracy vs. resources needed for evaluation.
{ {
supportedSystems = [ supportedSystems = [
# Not ready to evaluate these archs, see #32365 "aarch64-linux"
# "aarch64-linux" "i686-linux"
# "i686-linux"
"x86_64-linux" "x86_64-linux"
"x86_64-darwin" "x86_64-darwin"
]; ];
nixpkgsArgs = { nixpkgsArgs = {
config = { config = {
allowBroken = true; allowBroken = true;
allowUnfree = true; allowUnfree = true;
allowInsecurePredicate = x: true; allowInsecurePredicate = x: true;
checkMeta = false; # checkMeta; see #32365 checkMeta = checkMeta;
# See https://github.com/NixOS/nixpkgs/pull/32365
handleEvalIssue = reason: errormsg: handleEvalIssue = reason: errormsg:
if reason == "unknown-meta" if reason == "unknown-meta"
then (builtins.trace (abort errormsg) true) then abort errormsg
else (builtins.trace errormsg true); else true;
inHydra = true; inHydra = true;
}; };

2
ofborg/src/tagger.rs
View file

@ -90,6 +90,8 @@ impl RebuildTagger {
match attr.rsplit(".").next() { match attr.rsplit(".").next() {
Some("x86_64-darwin") => { counter_darwin += 1; } Some("x86_64-darwin") => { counter_darwin += 1; }
Some("x86_64-linux") => { counter_linux += 1; } Some("x86_64-linux") => { counter_linux += 1; }
Some("aarch64-linux") => { }
Some("i686-linux") => { }
Some(arch) => { info!("Unknown arch: {:?}", arch); } Some(arch) => { info!("Unknown arch: {:?}", arch); }
None => { info!("Cannot grok attr: {:?}", attr); } None => { info!("Cannot grok attr: {:?}", attr); }
} }

4
ofborg/src/tasks/massrebuilder.rs
View file

@ -306,12 +306,11 @@ impl worker::SimpleWorker for MassRebuildWorker {
) )
.all(|status| status == Ok(())); .all(|status| status == Ok(()));
/*
if eval_results { if eval_results {
let mut status = CommitStatus::new( let mut status = CommitStatus::new(
repo.statuses(), repo.statuses(),
job.pr.head_sha.clone(), job.pr.head_sha.clone(),
String::from("Meta Field Checks"), String::from("grahamcofborg-eval-check-meta"),
String::from("config.nix: checkMeta = true"), String::from("config.nix: checkMeta = true"),
None None
); );
@ -346,7 +345,6 @@ impl worker::SimpleWorker for MassRebuildWorker {
status.set_url(gist_url); status.set_url(gist_url);
status.set(state.clone()); status.set(state.clone());
} }
*/
if eval_results { if eval_results {
overall_status.set_with_description( overall_status.set_with_description(