diff options
| -rw-r--r-- | .cirrus.yml | 4 | ||||
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | libpod/runtime_volume_unsupported.go | 2 | ||||
| -rw-r--r-- | pkg/rootless/rootless_unsupported.go | 2 |
4 files changed, 6 insertions, 4 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index 9ce690196..8e26ce72e 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -135,8 +135,10 @@ gating_task: # This task builds Podman with different buildtags to ensure the build does # not break. build_script: + - '/usr/local/bin/entrypoint.sh clean podman' + - '/usr/local/bin/entrypoint.sh clean podman-remote' - '/usr/local/bin/entrypoint.sh clean podman BUILDTAGS="exclude_graphdriver_devicemapper selinux seccomp"' - + - '/usr/local/bin/entrypoint.sh clean podman-remote-darwin' build_each_commit_task: @@ -1,6 +1,6 @@ GO ?= go DESTDIR ?= / -EPOCH_TEST_COMMIT ?= 4b80517b6a638ff06f8ad432f0f0f5839283d058 +EPOCH_TEST_COMMIT ?= 1c45b42e9ff972d9645735118635e4186e6411f8 HEAD ?= HEAD CHANGELOG_BASE ?= HEAD~ CHANGELOG_TARGET ?= HEAD diff --git a/libpod/runtime_volume_unsupported.go b/libpod/runtime_volume_unsupported.go index d87459759..5fe487114 100644 --- a/libpod/runtime_volume_unsupported.go +++ b/libpod/runtime_volume_unsupported.go @@ -6,7 +6,7 @@ import ( "context" ) -func (r *Runtime) removeVolume(ctx context.Context, v *Volume, force, prune bool) error { +func (r *Runtime) removeVolume(ctx context.Context, v *Volume, force bool) error { return ErrNotImplemented } diff --git a/pkg/rootless/rootless_unsupported.go b/pkg/rootless/rootless_unsupported.go index 54e70961b..e01d7855c 100644 --- a/pkg/rootless/rootless_unsupported.go +++ b/pkg/rootless/rootless_unsupported.go @@ -41,7 +41,7 @@ func SkipStorageSetup() bool { // JoinNS re-exec podman in a new userNS and join the user namespace of the specified // PID. -func JoinNS(pid uint) (bool, int, error) { +func JoinNS(pid uint, preserveFDs int) (bool, int, error) { return false, -1, errors.New("this function is not supported on this os") } |