Skip to content

Commit

Permalink
Merge pull request #3689 from austinvazquez/update-containerd-v1.7.24
Browse files Browse the repository at this point in the history
Update containerd (1.7.24) in CI
  • Loading branch information
djdongjin authored Nov 23, 2024
2 parents 2ec8290 + 0e8abac commit 9ece9be
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/test-canary.yml
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ jobs:
- uses: actions/[email protected]
with:
repository: containerd/containerd
ref: "v1.7.23"
ref: "v1.7.24"
path: containerd
fetch-depth: 1
- name: "Set up CNI"
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
containerd: v1.6.36
arch: amd64
- runner: ubuntu-24.04
containerd: v1.7.23
containerd: v1.7.24
arch: amd64
- runner: ubuntu-24.04
containerd: v2.0.0
Expand Down Expand Up @@ -85,7 +85,7 @@ jobs:
uses: actions/[email protected]
with:
repository: containerd/containerd
ref: v1.7.23
ref: v1.7.24
path: containerd
fetch-depth: 1
- if: ${{ matrix.goos=='windows' }}
Expand All @@ -110,7 +110,7 @@ jobs:
runner: "ubuntu-20.04"
arch: amd64
- ubuntu: 22.04
containerd: v1.7.23
containerd: v1.7.24
runner: "ubuntu-22.04"
arch: amd64
- ubuntu: 24.04
Expand Down Expand Up @@ -235,7 +235,7 @@ jobs:
target: rootless
arch: amd64
- ubuntu: 22.04
containerd: v1.7.23
containerd: v1.7.24
rootlesskit: v2.3.1
target: rootless
arch: amd64
Expand All @@ -245,7 +245,7 @@ jobs:
target: rootless
arch: amd64
- ubuntu: 24.04
containerd: v1.7.23
containerd: v1.7.24
rootlesskit: v2.3.1
target: rootless-port-slirp4netns
arch: amd64
Expand Down Expand Up @@ -378,15 +378,15 @@ jobs:
- uses: actions/[email protected]
with:
repository: containerd/containerd
ref: v1.7.23
ref: v1.7.24
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.23
ctrdVersion: 1.7.24
run: powershell hack/configure-windows-ci.ps1
- name: "Run integration tests"
run: ./hack/test-integration.sh -test.only-flaky=false
Expand Down

0 comments on commit 9ece9be

Please sign in to comment.