the-distro/ofborg
2
0
Fork 1
Code Issues 1 Pull requests 1 Packages Projects Releases Wiki Activity

Disable the supportedSystem limiter when doing evaluation checks

Browse source
This commit is contained in:
Graham Christensen 2018-01-31 16:48:30 -05:00
parent 4aaab0644a
commit 8a2c75dfe3
No known key found for this signature in database
GPG key ID: ACA1C1D120C83D5C
2 changed files with 33 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
ofborg/src/nix.rs
View file

@ -11,6 +11,7 @@ pub struct Nix {
system: String,
remote: String,
build_timeout: u16,
limit_supported_systems: bool,
}
impl Nix {
@ -19,6 +20,7 @@ impl Nix {
system: system,
remote: remote,
build_timeout: build_timeout,
limit_supported_systems: true,
};
}
@ -27,6 +29,25 @@ impl Nix {
system: system,
remote: self.remote.clone(),
build_timeout: self.build_timeout,
limit_supported_systems: self.limit_supported_systems,
};
}
pub fn with_limited_supported_systems(&self) -> Nix {
return Nix {
system: self.system.clone(),
remote: self.remote.clone(),
build_timeout: self.build_timeout,
limit_supported_systems: true,
};
}
pub fn without_limited_supported_systems(&self) -> Nix {
return Nix {
system: self.system.clone(),
remote: self.remote.clone(),
build_timeout: self.build_timeout,
limit_supported_systems: false,
};
}
@ -119,13 +140,17 @@ impl Nix {
],
);
command.args(&["--argstr", "system", &self.system]);
command.args(
&[
"--arg",
"supportedSystems",
&format!("[\"{}\"]", &self.system),
],
);
if self.limit_supported_systems {
command.args(
&[
"--arg",
"supportedSystems",
&format!("[\"{}\"]", &self.system),
],
);
}
command.args(args);
return command;

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

@ -39,7 +39,7 @@ impl<E: stats::SysEvents> MassRebuildWorker<E> {
) -> MassRebuildWorker<E> {
return MassRebuildWorker {
cloner: cloner,
nix: nix,
nix: nix.without_limited_supported_systems(),
github: github,
identity: identity,
events: events,