From 27e8dff923d3dbd3bd216f6f3872c5d65026695f Mon Sep 17 00:00:00 2001 From: yihuaf Date: Fri, 21 Apr 2023 22:32:53 +0000 Subject: [PATCH 1/2] fix ci Signed-off-by: yihuaf --- .../libcontainer/src/process/container_main_process.rs | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/crates/libcontainer/src/process/container_main_process.rs b/crates/libcontainer/src/process/container_main_process.rs index 245a5b3a3..33a024281 100644 --- a/crates/libcontainer/src/process/container_main_process.rs +++ b/crates/libcontainer/src/process/container_main_process.rs @@ -12,7 +12,6 @@ use nix::unistd::Pid; use crate::seccomp; #[cfg(feature = "libseccomp")] use nix::{ - errno::Errno, sys::socket::{self, UnixAddr}, unistd, }; @@ -117,15 +116,12 @@ pub fn container_main_process(container_args: &ContainerArgs) -> Result { log::warn!("intermediate process killed with signal: {sig}") } Ok(_) => (), - Err(err) => { + Err(nix::errno::Errno::ECHILD) => { // This is safe because intermediate_process and main_process check if the process is // finished by piping instead of exit code. - if err == Errno::ECHILD { - log::warn!("intermediate process already reaped"); - } else { - bail!("failed to wait for intermediate process: {err}"); - } + log::warn!("intermediate process already reaped"); } + Err(err) => bail!("failed to wait for intermediate process: {err}"), }; Ok(init_pid) From b293e8f1423220023271bf5e84f7a041e240a450 Mon Sep 17 00:00:00 2001 From: yihuaf Date: Fri, 21 Apr 2023 22:48:13 +0000 Subject: [PATCH 2/2] add workflow_dispatch as manual trigger to CI Signed-off-by: yihuaf --- .github/workflows/integration_tests_validation.yaml | 1 + .github/workflows/main.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/integration_tests_validation.yaml b/.github/workflows/integration_tests_validation.yaml index baa0b9d3d..17b2571b9 100644 --- a/.github/workflows/integration_tests_validation.yaml +++ b/.github/workflows/integration_tests_validation.yaml @@ -5,6 +5,7 @@ on: pull_request: branches: - main + workflow_dispatch: jobs: changes: diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8fd27e49c..417b945d5 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -5,6 +5,7 @@ on: pull_request: branches: - main + workflow_dispatch: jobs: changes: