mirror of
https://github.com/containers/youki
synced 2024-11-23 01:11:58 +01:00
Merge pull request #727 from YJDoc2/oci-test-fix
Remove caching of OCI tests in CI
This commit is contained in:
commit
673d2e1a09
8
.github/workflows/main.yml
vendored
8
.github/workflows/main.yml
vendored
@ -107,12 +107,6 @@ jobs:
|
||||
- uses: actions/checkout@v2
|
||||
with:
|
||||
submodules: recursive
|
||||
- name: Cache runtime-tools
|
||||
id: cache-runtime-tools
|
||||
uses: actions/cache@v2
|
||||
with:
|
||||
path: integration_test
|
||||
key: ${{ runner.os }}-${{ matrix.rust }}-primes
|
||||
- uses: actions-rs/toolchain@v1
|
||||
with:
|
||||
toolchain: ${{ matrix.rust }}
|
||||
@ -125,6 +119,6 @@ jobs:
|
||||
run: ./build.sh --release
|
||||
- uses: actions/setup-go@v2
|
||||
with:
|
||||
go-version: "1.11.0"
|
||||
go-version: "1.17.6"
|
||||
- name: Run integration tests
|
||||
run: ./integration_test.sh
|
||||
|
@ -7,7 +7,7 @@ use std::sync::Arc;
|
||||
use std::{any::Any, mem, path::Path, ptr};
|
||||
|
||||
use anyhow::{anyhow, bail, Result};
|
||||
use caps::{CapSet, Capability, CapsHashSet};
|
||||
use caps::{CapSet, CapsHashSet};
|
||||
use libc::{c_char, uid_t};
|
||||
use nix::{
|
||||
errno::Errno,
|
||||
@ -132,15 +132,7 @@ impl Syscall for LinuxSyscall {
|
||||
// for each such =, drop that capability
|
||||
// after this, only those which are to be set will remain set
|
||||
for c in all.difference(value) {
|
||||
match c {
|
||||
Capability::CAP_PERFMON
|
||||
| Capability::CAP_CHECKPOINT_RESTORE
|
||||
| Capability::CAP_BPF => {
|
||||
log::warn!("{:?} is not supported.", c);
|
||||
continue;
|
||||
}
|
||||
_ => caps::drop(None, CapSet::Bounding, *c)?,
|
||||
}
|
||||
caps::drop(None, CapSet::Bounding, *c)?
|
||||
}
|
||||
}
|
||||
_ => {
|
||||
|
Loading…
Reference in New Issue
Block a user