Skip to content

Commit

Permalink
CI: update Ubuntu (24.04)
Browse files Browse the repository at this point in the history
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
  • Loading branch information
AkihiroSuda committed Jun 20, 2024
1 parent e2464b0 commit a9aac03
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 24 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ghcr-image-build-and-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ env:
jobs:
build:

runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
permissions:
contents: read
packages: write
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ env:
GO111MODULE: on
jobs:
release:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
timeout-minutes: 40
steps:
- uses: actions/checkout@v4.1.7
Expand Down
42 changes: 21 additions & 21 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ env:
jobs:
project:
name: Project Checks
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
timeout-minutes: 20
steps:
- uses: actions/checkout@v4.1.7
Expand All @@ -36,7 +36,7 @@ jobs:
working-directory: src/github.com/containerd/nerdctl

lint:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
timeout-minutes: 20
steps:
- uses: actions/checkout@v4.1.7
Expand All @@ -56,7 +56,7 @@ jobs:
run: yamllint .

test-unit:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
timeout-minutes: 20
steps:
- uses: actions/checkout@v4.1.7
Expand All @@ -76,15 +76,15 @@ jobs:
strategy:
fail-fast: false
matrix:
# ubuntu-20.04: cgroup v1, ubuntu-22.04: cgroup v2
# ubuntu-20.04: cgroup v1, ubuntu-24.04: cgroup v2
include:
- ubuntu: 20.04
containerd: v1.6.33
- ubuntu: 20.04
containerd: v1.7.18
- ubuntu: 22.04
- ubuntu: 24.04
containerd: v1.7.18
- ubuntu: 22.04
- ubuntu: 24.04
containerd: main # v2.0.0-rc.X

Check warning on line 88 in .github/workflows/test.yml

View workflow job for this annotation

GitHub Actions / lint

88:30 [comments] too few spaces before comment
env:
UBUNTU_VERSION: "${{ matrix.ubuntu }}"
Expand Down Expand Up @@ -117,9 +117,9 @@ jobs:
strategy:
fail-fast: false
matrix:
# ubuntu-20.04: cgroup v1, ubuntu-22.04: cgroup v2
# ubuntu-20.04: cgroup v1, ubuntu-24.04: cgroup v2
include:
- ubuntu: 22.04
- ubuntu: 24.04
containerd: v1.7.18
env:
UBUNTU_VERSION: "${{ matrix.ubuntu }}"
Expand Down Expand Up @@ -166,7 +166,7 @@ jobs:
strategy:
fail-fast: false
matrix:
# ubuntu-22.04: cgroup v1, ubuntu-22.04: cgroup v2
# ubuntu-24.04: cgroup v1, ubuntu-24.04: cgroup v2
include:
- ubuntu: 20.04
containerd: v1.6.33
Expand All @@ -176,11 +176,11 @@ jobs:
containerd: v1.7.18
rootlesskit: v2.1.0
target: test-integration-rootless
- ubuntu: 22.04
- ubuntu: 24.04
containerd: v1.7.18
rootlesskit: v1.1.1
target: test-integration-rootless
- ubuntu: 22.04
- ubuntu: 24.04
containerd: main # v2.0.0-rc.X

Check warning on line 184 in .github/workflows/test.yml

View workflow job for this annotation

GitHub Actions / lint

184:30 [comments] too few spaces before comment
rootlesskit: v2.1.0
target: test-integration-rootless
Expand All @@ -192,11 +192,11 @@ jobs:
containerd: v1.7.18
rootlesskit: v2.1.0
target: test-integration-rootless-port-slirp4netns
- ubuntu: 22.04
- ubuntu: 24.04
containerd: v1.7.18
rootlesskit: v1.1.1
target: test-integration-rootless-port-slirp4netns
- ubuntu: 22.04
- ubuntu: 24.04
containerd: main # v2.0.0-rc.X

Check warning on line 200 in .github/workflows/test.yml

View workflow job for this annotation

GitHub Actions / lint

200:30 [comments] too few spaces before comment
rootlesskit: v2.1.0
target: test-integration-rootless-port-slirp4netns
Expand All @@ -222,7 +222,7 @@ jobs:
command: docker run -t --rm --privileged -e WORKAROUND_ISSUE_622=1 ${TEST_TARGET}

cross:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
timeout-minutes: 40
strategy:
matrix:
Expand All @@ -240,7 +240,7 @@ jobs:
run: GO_VERSION="$(echo ${{ matrix.go-version }} | sed -e s/.x//)" make artifacts

test-integration-docker-compatibility:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
timeout-minutes: 45
steps:
- uses: actions/checkout@v4.1.7
Expand All @@ -262,11 +262,11 @@ jobs:
jq '.features.buildkit = true' </etc/docker/daemon.json | sudo sponge /etc/docker/daemon.json
cat /etc/docker/daemon.json
# Download Docker packages
curl -OSL https://download.docker.com/linux/ubuntu/dists/jammy/pool/stable/amd64/containerd.io_1.6.33-1_amd64.deb
curl -OSL https://download.docker.com/linux/ubuntu/dists/jammy/pool/stable/amd64/docker-ce_26.1.4-1~ubuntu.22.04~jammy_amd64.deb
curl -OSl https://download.docker.com/linux/ubuntu/dists/jammy/pool/stable/amd64/docker-ce-cli_26.1.4-1~ubuntu.22.04~jammy_amd64.deb
curl -OSL https://download.docker.com/linux/ubuntu/dists/jammy/pool/stable/amd64/docker-buildx-plugin_0.14.1-1~ubuntu.22.04~jammy_amd64.deb
curl -OSL https://download.docker.com/linux/ubuntu/dists/jammy/pool/stable/amd64/docker-compose-plugin_2.27.1-1~ubuntu.22.04~jammy_amd64.deb
curl -OSL https://download.docker.com/linux/ubuntu/dists/noble/pool/stable/amd64/containerd.io_1.6.33-1_amd64.deb
curl -OSL https://download.docker.com/linux/ubuntu/dists/noble/pool/stable/amd64/docker-ce_26.1.4-1~ubuntu.24.04~noble_amd64.deb
curl -OSl https://download.docker.com/linux/ubuntu/dists/noble/pool/stable/amd64/docker-ce-cli_26.1.4-1~ubuntu.24.04~noble_amd64.deb
curl -OSL https://download.docker.com/linux/ubuntu/dists/noble/pool/stable/amd64/docker-buildx-plugin_0.14.1-1~ubuntu.24.04~noble_amd64.deb
curl -OSL https://download.docker.com/linux/ubuntu/dists/noble/pool/stable/amd64/docker-compose-plugin_2.27.1-1~ubuntu.24.04~noble_amd64.deb
# Install Docker
sudo apt-get install -y ./*.deb
rm -f ./*.deb
Expand Down Expand Up @@ -328,7 +328,7 @@ jobs:

test-integration-freebsd:
name: FreeBSD
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
timeout-minutes: 20

steps:
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ ARG BUILDG_VERSION=v0.4.1

# Test deps
ARG GO_VERSION=1.22
ARG UBUNTU_VERSION=22.04
ARG UBUNTU_VERSION=24.04
ARG CONTAINERIZED_SYSTEMD_VERSION=v0.1.1
ARG GOTESTSUM_VERSION=v1.12.0
ARG NYDUS_VERSION=v2.2.5
Expand Down

0 comments on commit a9aac03

Please sign in to comment.