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

Merge pull request #442 from flokli/ofborg-pass-rev

Browse source 
ofborg: pass rev
This commit is contained in:
Graham Christensen 2020-03-30 08:31:04 -04:00 committed by GitHub
parent ea4b7f8aab 5fadddfbb0
commit 33258c16c6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ofborg/src/nix.rs
View file

@ -219,7 +219,7 @@ impl Nix {
args.push(String::from("--arg")); args.push(String::from("--arg"));
args.push(String::from("nixpkgs")); args.push(String::from("nixpkgs"));
args.push(String::from( args.push(String::from(
"{ outPath=./.; revCount=999999; shortRev=\"ofborg\"; }", "{ outPath=./.; revCount=999999; shortRev=\"ofborg\"; rev=\"0000000000000000000000000000000000000000\"; }",
)); ));
} }
command.args(args); command.args(args);
@ -659,7 +659,7 @@ mod tests {
Expect::Pass, Expect::Pass,
vec![ vec![
"./nixos/release.nix", "./nixos/release.nix",
"--arg nixpkgs { outPath=./.; revCount=999999; shortRev=\"ofborg\"; }", "--arg nixpkgs { outPath=./.; revCount=999999; shortRev=\"ofborg\"; rev=\"0000000000000000000000000000000000000000\"; }",
], ],
); );
} }

20
ofborg/src/tasks/eval/nixpkgs.rs
View file

@ -406,6 +406,12 @@ impl<'a> EvaluationStrategy for NixpkgsStrategy<'a> {
} }
fn evaluation_checks(&self) -> Vec<EvalChecker> { fn evaluation_checks(&self) -> Vec<EvalChecker> {
// the value that's passed as the nixpkgs arg
let nixpkgs_arg_value = format!(
"{{ outPath=./.; revCount=999999; shortRev=\"{}\"; rev=\"{}\"; }}",
&self.job.pr.head_sha[0..7],
&self.job.pr.head_sha,
);
vec![ vec![
EvalChecker::new( EvalChecker::new(
"package-list", "package-list",
@ -431,7 +437,7 @@ impl<'a> EvaluationStrategy for NixpkgsStrategy<'a> {
vec![ vec![
String::from("--arg"), String::from("--arg"),
String::from("nixpkgs"), String::from("nixpkgs"),
String::from("{ outPath=./.; revCount=999999; shortRev=\"ofborg\"; }"), nixpkgs_arg_value.clone(),
String::from("./nixos/release-combined.nix"), String::from("./nixos/release-combined.nix"),
String::from("-A"), String::from("-A"),
String::from("tested"), String::from("tested"),
@ -444,7 +450,7 @@ impl<'a> EvaluationStrategy for NixpkgsStrategy<'a> {
vec![ vec![
String::from("--arg"), String::from("--arg"),
String::from("nixpkgs"), String::from("nixpkgs"),
String::from("{ outPath=./.; revCount=999999; shortRev=\"ofborg\"; }"), nixpkgs_arg_value.clone(),
String::from("./nixos/release.nix"), String::from("./nixos/release.nix"),
String::from("-A"), String::from("-A"),
String::from("options"), String::from("options"),
@ -457,7 +463,7 @@ impl<'a> EvaluationStrategy for NixpkgsStrategy<'a> {
vec![ vec![
String::from("--arg"), String::from("--arg"),
String::from("nixpkgs"), String::from("nixpkgs"),
String::from("{ outPath=./.; revCount=999999; shortRev=\"ofborg\"; }"), nixpkgs_arg_value.clone(),
String::from("./nixos/release.nix"), String::from("./nixos/release.nix"),
String::from("-A"), String::from("-A"),
String::from("manual"), String::from("manual"),
@ -470,7 +476,7 @@ impl<'a> EvaluationStrategy for NixpkgsStrategy<'a> {
vec![ vec![
String::from("--arg"), String::from("--arg"),
String::from("nixpkgs"), String::from("nixpkgs"),
String::from("{ outPath=./.; revCount=999999; shortRev=\"ofborg\"; }"), nixpkgs_arg_value.clone(),
String::from("./pkgs/top-level/release.nix"), String::from("./pkgs/top-level/release.nix"),
String::from("-A"), String::from("-A"),
String::from("manual"), String::from("manual"),
@ -483,7 +489,7 @@ impl<'a> EvaluationStrategy for NixpkgsStrategy<'a> {
vec![ vec![
String::from("--arg"), String::from("--arg"),
String::from("nixpkgs"), String::from("nixpkgs"),
String::from("{ outPath=./.; revCount=999999; shortRev=\"ofborg\"; }"), nixpkgs_arg_value.clone(),
String::from("./pkgs/top-level/release.nix"), String::from("./pkgs/top-level/release.nix"),
String::from("-A"), String::from("-A"),
String::from("tarball"), String::from("tarball"),
@ -496,7 +502,7 @@ impl<'a> EvaluationStrategy for NixpkgsStrategy<'a> {
vec![ vec![
String::from("--arg"), String::from("--arg"),
String::from("nixpkgs"), String::from("nixpkgs"),
String::from("{ outPath=./.; revCount=999999; shortRev=\"ofborg\"; }"), nixpkgs_arg_value.clone(),
String::from("./pkgs/top-level/release.nix"), String::from("./pkgs/top-level/release.nix"),
String::from("-A"), String::from("-A"),
String::from("unstable"), String::from("unstable"),
@ -509,7 +515,7 @@ impl<'a> EvaluationStrategy for NixpkgsStrategy<'a> {
vec![ vec![
String::from("--arg"), String::from("--arg"),
String::from("nixpkgs"), String::from("nixpkgs"),
String::from("{ outPath=./.; revCount=999999; shortRev=\"ofborg\"; }"), nixpkgs_arg_value,
String::from("./pkgs/top-level/release.nix"), String::from("./pkgs/top-level/release.nix"),
String::from("-A"), String::from("-A"),
String::from("darwin-tested"), String::from("darwin-tested"),