Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

vendor: drop libpod in runner package #529

Merged
merged 2 commits into from
Sep 23, 2024
Merged

vendor: drop libpod in runner package #529

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
43cd092
vendor: drop libpod in runner package
haircommander Sep 20, 2024
d15057b
gh actions: add sudo to make command
haircommander Sep 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/integration.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
~/.cache/go-build
key: go-integration-conmon-${{ hashFiles('**/go.mod') }}
restore-keys: go-integration-conmon-
- run: hack/github-actions-setup
- run: sudo hack/github-actions-setup
- name: Run conmon integration tests
run: |
sudo make vendor
Expand All @@ -42,12 +42,12 @@ jobs:
~/.cache/go-build
key: go-integration-cri-o-${{ hashFiles('**/go.mod') }}
restore-keys: go-integration-cri-o-
- run: hack/github-actions-setup
- run: sudo hack/github-actions-setup
- name: Run CRI-O integration tests
run: |
cd $(go env GOPATH)/src/github.com/cri-o/cri-o
make all test-binaries
CRIO_DIR=$(sudo go env GOPATH)/src/github.com/cri-o/cri-o
sudo -D "$CRIO_DIR" make all test-binaries
# skip seccomp tests because they have permission denied issues in a container and accept signed image as they don't use conmon
sudo -E test/test_runner.sh $(ls test/ | grep bats | grep -E -v seccomp\|image\|policy)
sudo -D "$CRIO_DIR" -E $(CRIO_DIR)/test/test_runner.sh $(ls $(CRIO_DIR)/test/ | grep bats | grep -E -v seccomp\|image\|policy)
env:
JOBS: '2'
17 changes: 3 additions & 14 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ module github.com/containers/conmon
go 1.18

require (
github.com/containers/podman/v4 v4.5.0
github.com/containers/storage v1.48.0
github.com/coreos/go-systemd/v22 v22.5.0
github.com/onsi/ginkgo/v2 v2.15.0
Expand All @@ -14,30 +13,20 @@ require (
)

require (
github.com/blang/semver/v4 v4.0.0 // indirect
github.com/containers/common v0.52.0 // indirect
github.com/containers/image/v5 v5.25.0 // indirect
github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01 // indirect
github.com/containers/ocicrypt v1.1.7 // indirect
github.com/docker/docker v25.0.6+incompatible // indirect
github.com/docker/go-units v0.5.0 // indirect
github.com/go-logr/logr v1.3.0 // indirect
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/kr/text v0.2.0 // indirect
github.com/moby/sys/mountinfo v0.6.2 // indirect
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.1.0-rc2.0.20221005185240-3a7f492d3f1b // indirect
github.com/opencontainers/runc v1.1.7 // indirect
github.com/opencontainers/runtime-spec v1.1.0-rc.3 // indirect
github.com/sirupsen/logrus v1.9.3 // indirect
github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 // indirect
golang.org/x/exp v0.0.0-20230321023759-10a507213a29 // indirect
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
golang.org/x/net v0.19.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/tools v0.16.1 // indirect
google.golang.org/protobuf v1.30.0 // indirect
gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
Loading
Loading