Disable the supportedSystem limiter when doing evaluation checks
This commit is contained in:
parent
4aaab0644a
commit
8a2c75dfe3
|
@ -11,6 +11,7 @@ pub struct Nix {
|
||||||
system: String,
|
system: String,
|
||||||
remote: String,
|
remote: String,
|
||||||
build_timeout: u16,
|
build_timeout: u16,
|
||||||
|
limit_supported_systems: bool,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Nix {
|
impl Nix {
|
||||||
|
@ -19,6 +20,7 @@ impl Nix {
|
||||||
system: system,
|
system: system,
|
||||||
remote: remote,
|
remote: remote,
|
||||||
build_timeout: build_timeout,
|
build_timeout: build_timeout,
|
||||||
|
limit_supported_systems: true,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -27,6 +29,25 @@ impl Nix {
|
||||||
system: system,
|
system: system,
|
||||||
remote: self.remote.clone(),
|
remote: self.remote.clone(),
|
||||||
build_timeout: self.build_timeout,
|
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(&["--argstr", "system", &self.system]);
|
||||||
command.args(
|
|
||||||
&[
|
if self.limit_supported_systems {
|
||||||
"--arg",
|
command.args(
|
||||||
"supportedSystems",
|
&[
|
||||||
&format!("[\"{}\"]", &self.system),
|
"--arg",
|
||||||
],
|
"supportedSystems",
|
||||||
);
|
&format!("[\"{}\"]", &self.system),
|
||||||
|
],
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
command.args(args);
|
command.args(args);
|
||||||
|
|
||||||
return command;
|
return command;
|
||||||
|
|
|
@ -39,7 +39,7 @@ impl<E: stats::SysEvents> MassRebuildWorker<E> {
|
||||||
) -> MassRebuildWorker<E> {
|
) -> MassRebuildWorker<E> {
|
||||||
return MassRebuildWorker {
|
return MassRebuildWorker {
|
||||||
cloner: cloner,
|
cloner: cloner,
|
||||||
nix: nix,
|
nix: nix.without_limited_supported_systems(),
|
||||||
github: github,
|
github: github,
|
||||||
identity: identity,
|
identity: identity,
|
||||||
events: events,
|
events: events,
|
||||||
|
|
Loading…
Reference in a new issue