Skip to content

Commit

Permalink
Merge pull request containerd#10823 from austinvazquez/cherry-pick-ee…
Browse files Browse the repository at this point in the history
…921689f739bd495b66105f62676e86c21718ba-to-1.6

[release/1.6 backport] Switch from actuated.dev to GH Action runners for arm64
  • Loading branch information
AkihiroSuda authored Oct 12, 2024
2 parents d27b56b + ba41148 commit 11aea72
Showing 1 changed file with 15 additions and 10 deletions.
25 changes: 15 additions & 10 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,13 @@ jobs:

strategy:
matrix:
os: [ubuntu-20.04, actuated-arm64-4cpu-16gb, macos-13, windows-2019]
os: [ubuntu-20.04, arm64-8core-32gb, macos-13, windows-2019]
exclude:
- os: ${{ github.repository != 'containerd/containerd' && 'arm64-8core-32gb' }}

steps:
- name: Install dependencies
if: matrix.os == 'ubuntu-20.04' || matrix.os == 'actuated-arm64-4cpu-16gb'
if: matrix.os == 'ubuntu-20.04' || matrix.os == 'arm64-8core-32gb'
run: |
sudo apt-get update
sudo apt-get install -y libbtrfs-dev
Expand All @@ -49,7 +51,6 @@ jobs:
#
project:
name: Project Checks
if: github.repository == 'containerd/containerd'
runs-on: ubuntu-20.04
timeout-minutes: 5

Expand All @@ -62,6 +63,7 @@ jobs:
- uses: ./src/github.com/containerd/containerd/.github/actions/install-go

- uses: containerd/[email protected]
if: github.repository == 'containerd/containerd'
with:
working-directory: src/github.com/containerd/containerd
repo-access-token: ${{ secrets.GITHUB_TOKEN }}
Expand Down Expand Up @@ -217,11 +219,13 @@ jobs:

strategy:
matrix:
os: [ubuntu-20.04, actuated-arm64-4cpu-16gb, macos-13, windows-2019, windows-2022]
os: [ubuntu-20.04, arm64-8core-32gb, macos-13, windows-2019, windows-2022]
go-version: ["1.22.8", "1.23.2"]
exclude:
- os: ${{ github.repository != 'containerd/containerd' && 'arm64-8core-32gb' }}
steps:
- name: Install dependencies
if: matrix.os == 'ubuntu-20.04' || matrix.os == 'actuated-arm64-4cpu-16gb'
if: matrix.os == 'ubuntu-20.04' || matrix.os == 'arm64-8core-32gb'
run: |
sudo apt-get update
sudo apt-get install -y libbtrfs-dev
Expand Down Expand Up @@ -350,18 +354,19 @@ jobs:
matrix:
runtime: [io.containerd.runtime.v1.linux, io.containerd.runc.v1, io.containerd.runc.v2]
runc: [runc, crun]
os: [ubuntu-20.04, arm64-8core-32gb]
exclude:
- os: ${{ github.repository != 'containerd/containerd' && 'arm64-8core-32gb' }}
- runtime: io.containerd.runc.v1
runc: crun
- runtime: io.containerd.runtime.v1.linux
runc: crun
# runc.v1 doesn't support cgroupv2
- runtime: io.containerd.runc.v1
os: actuated-arm64-4cpu-16gb
os: arm64-8core-32gb
# shim.v1 doesn't support cgroupv2
- runtime: io.containerd.runtime.v1.linux
os: actuated-arm64-4cpu-16gb
os: [ubuntu-20.04, actuated-arm64-4cpu-16gb]
os: arm64-8core-32gb

env:
GOTEST: gotestsum --
Expand All @@ -381,10 +386,10 @@ jobs:
script/setup/install-failpoint-binaries
- name: Install criu
# NOTE: Required actuated enable CONFIG_CHECKPOINT_RESTORE
# NOTE: Required arm64 enable CONFIG_CHECKPOINT_RESTORE (need to confirm GitHub action runners config)
#
# REF: https://criu.org/Linux_kernel
if: matrix.os != 'actuated-arm64-4cpu-16gb'
if: matrix.os != 'arm64-8core-32gb'
run: |
sudo add-apt-repository ppa:criu/ppa
sudo apt-get update
Expand Down

0 comments on commit 11aea72

Please sign in to comment.