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

Note about the comment parser and the x86_64-linux limit on tests

Browse source
This commit is contained in:
Graham Christensen 2018-01-14 15:14:31 -05:00
parent 2135dd3941
commit 56f0701b80
No known key found for this signature in database
GPG key ID: ACA1C1D120C83D5C
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ofborg/src/commentparser.rs
View file

@ -183,9 +183,9 @@ baz"));
#[test] #[test]
fn test_comment() { fn test_comment() {
assert_eq!(Some(vec![Instruction::Build(Subset::NixOS, vec![ assert_eq!(Some(vec![Instruction::Build(Subset::NixOS, vec![
String::from("tests.foo"), String::from("tests.foo.x86_64-linux"),
String::from("tests.bar"), String::from("tests.bar.x86_64-linux"),
String::from("tests.baz") String::from("tests.baz.x86_64-linux")
])]), ])]),
parse("@GrahamCOfBorg test foo bar baz")); parse("@GrahamCOfBorg test foo bar baz"));
} }

2
ofborg/src/tasks/build.rs
View file

@ -71,6 +71,8 @@ impl worker::SimpleWorker for BuildWorker {
_ => "./default.nix" _ => "./default.nix"
}; };
// Note: Don't change the system limiter until the system isn't
// hardcoded to x86_64-linux in the githubcommentfilter
if buildfile == "./nixos/release.nix" && self.system != "x86_64-linux" { if buildfile == "./nixos/release.nix" && self.system != "x86_64-linux" {
// NixOS jobs get routed to all builders, even though darwin // NixOS jobs get routed to all builders, even though darwin
// cannot build them. // cannot build them.