Skip to content

Commit

Permalink
update containerd (1.7.16)
Browse files Browse the repository at this point in the history
Signed-off-by: Akihiro Suda <[email protected]>
(cherry picked from commit 4705392)
Signed-off-by: Akihiro Suda <[email protected]>
  • Loading branch information
AkihiroSuda committed Apr 26, 2024
1 parent eddcbc0 commit fd43768
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
18 changes: 9 additions & 9 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,9 @@ jobs:
- ubuntu: 20.04
containerd: v1.6.31
- ubuntu: 20.04
containerd: v1.7.15
containerd: v1.7.16
- ubuntu: 22.04
containerd: v1.7.15
containerd: v1.7.16
- ubuntu: 22.04
containerd: main
env:
Expand Down Expand Up @@ -113,7 +113,7 @@ jobs:
# ubuntu-20.04: cgroup v1, ubuntu-22.04: cgroup v2
include:
- ubuntu: 22.04
containerd: v1.7.15
containerd: v1.7.16
env:
UBUNTU_VERSION: "${{ matrix.ubuntu }}"
CONTAINERD_VERSION: "${{ matrix.containerd }}"
Expand Down Expand Up @@ -161,11 +161,11 @@ jobs:
rootlesskit: v1.1.1
target: test-integration-rootless
- ubuntu: 20.04
containerd: v1.7.15
containerd: v1.7.16
rootlesskit: v2.0.2
target: test-integration-rootless
- ubuntu: 22.04
containerd: v1.7.15
containerd: v1.7.16
rootlesskit: v1.1.1
target: test-integration-rootless
- ubuntu: 22.04
Expand All @@ -177,11 +177,11 @@ jobs:
rootlesskit: v1.1.1
target: test-integration-rootless-port-slirp4netns
- ubuntu: 20.04
containerd: v1.7.15
containerd: v1.7.16
rootlesskit: v2.0.2
target: test-integration-rootless-port-slirp4netns
- ubuntu: 22.04
containerd: v1.7.15
containerd: v1.7.16
rootlesskit: v1.1.1
target: test-integration-rootless-port-slirp4netns
- ubuntu: 22.04
Expand Down Expand Up @@ -276,15 +276,15 @@ jobs:
- uses: actions/[email protected]
with:
repository: containerd/containerd
ref: v1.7.15
ref: v1.7.16
path: containerd
fetch-depth: 1
- name: "Set up CNI"
working-directory: containerd
run: GOPATH=$(go env GOPATH) script/setup/install-cni-windows
- name: "Set up containerd"
env:
ctrdVersion: 1.7.15
ctrdVersion: 1.7.16
run: powershell hack/configure-windows-ci.ps1
# TODO: Run unit tests
- name: "Run integration tests"
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
# TODO: verify commit hash

# Basic deps
ARG CONTAINERD_VERSION=v1.7.15
ARG CONTAINERD_VERSION=v1.7.16
ARG RUNC_VERSION=v1.1.12
ARG CNI_PLUGINS_VERSION=v1.4.1

Expand Down

0 comments on commit fd43768

Please sign in to comment.