Commit fd4caab2 authored by matu3ba's avatar matu3ba
Browse files

fix(redox): fix ci to make ion build, bump dependencies

removes unnecessary unsafe blocks in ion
upstream nix also has them removed
bump dependencies, when we change lock file anyway
fix some warnings
parent c2bf1a3f
......@@ -9,6 +9,7 @@ before_script:
format:
image: 'rustlang/rust:nightly'
cache:
key: format
paths:
- cargo/
- target/
......@@ -20,6 +21,7 @@ format:
linux:
image: 'rust:1.43.0'
cache:
key: linux
paths:
- cargo/
- target/
......@@ -29,6 +31,7 @@ linux:
linux:stable:
cache:
key: linuxstable
paths:
- cargo/
- target/
......@@ -37,19 +40,21 @@ linux:stable:
- TOOLCHAIN= make tests
redox:
cache:
key: redox
paths:
- cargo/
- target/
before_script:
- apt-get update -qq
- apt-get install -qq build-essential curl git
- git clone --single-branch --branch=add-redox-support --depth=1 https://github.com/AdminXVII/nix
- mkdir .cargo
- echo 'paths = [ "nix" ]' >> .cargo/config
- cargo clean
script:
- redoxer test
link-check:
image: hrektts/mdbook
cache:
key: linkcheck
paths:
- cargo/
- cargo/bin
......
This diff is collapsed.
......@@ -77,7 +77,7 @@ auto_enums = "0.7"
atty = "0.2"
permutate = "0.3"
xdg = "2.2"
nix = { git = "https://github.com/AdminXVII/nix", branch = "add-redox-support-bis" }
nix = "0.20"
mktemp = "0.4"
......
......@@ -21,7 +21,7 @@ impl<'a> Shell<'a> {
pipeline: Pipeline<RefinedJob<'a>>,
state: ProcessState,
) -> Status {
match unistd::fork() {
match unsafe { unistd::fork() } {
Ok(ForkResult::Child) => {
self.opts_mut().grab_tty = false;
unsafe {
......
......@@ -296,7 +296,7 @@ impl<'a> Shell<'a> {
/// Waits until all running background tasks have completed, and listens for signals in the
/// event that a signal is sent to kill the running tasks.
pub fn wait_for_background(&mut self) -> Result<(), PipelineError> {
while { self.background_jobs().iter().any(BackgroundProcess::is_running) } {
while self.background_jobs().iter().any(BackgroundProcess::is_running) {
if let Some(signal) = signals::SignalHandler.find(|&s| s != Signal::SIGTSTP) {
self.background_send(signal).map_err(PipelineError::KillFailed)?;
return Err(PipelineError::Interrupted(Pid::this(), signal));
......
......@@ -574,7 +574,7 @@ fn fork_exec_internal<F>(
where
F: FnMut(Option<File>, Option<File>, Option<File>) -> Status,
{
match unistd::fork().map_err(PipelineError::CreateForkError)? {
match unsafe { unistd::fork().map_err(PipelineError::CreateForkError)? } {
ForkResult::Child => {
unsafe {
signal::signal(signal::Signal::SIGINT, signal::SigHandler::SigIgn).unwrap();
......
......@@ -109,7 +109,7 @@ impl Variables {
pub fn set<T: Into<Value<Rc<Function>>>>(&mut self, name: &str, value: T) {
let value = value.into();
if let Some(val) = self.0.get_mut(name) {
std::mem::replace(val, value);
let _ = std::mem::replace(val, value);
} else {
self.0.set(name, value);
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment