CI: arm64-8core-32gb -> ubuntu-24.04-arm

AkihiroSuda · AkihiroSuda · commit f5ab73c0a776 · 2025-02-26T10:56:17.000+09:00
GHA now provides ARM runners for free https://github.blog/changelog/2025-01-16-linux-arm64-hosted-runners-now-available-for-free-in-public-repositories-public-preview/ Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp> (cherry picked from commit 4e7484d) > Conflicts: > .github/workflows/ci.yml Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -26,13 +26,11 @@ jobs:
 
     strategy:
       matrix:
-        os: [ubuntu-20.04, arm64-8core-32gb, macos-13, windows-2019]
-        exclude:
-          - os: ${{ github.repository != 'containerd/containerd' && 'arm64-8core-32gb' }}
+        os: [ubuntu-20.04, ubuntu-24.04-arm, macos-13, windows-2019]
 
     steps:
       - name: Install dependencies
-        if: matrix.os == 'ubuntu-20.04' || matrix.os == 'arm64-8core-32gb'
+        if: matrix.os == 'ubuntu-20.04' || matrix.os == 'ubuntu-24.04-arm'
         run: |
           sudo apt-get update
           sudo apt-get install -y libbtrfs-dev
@@ -219,13 +217,11 @@ jobs:
 
     strategy:
       matrix:
-        os: [ubuntu-20.04, arm64-8core-32gb, macos-13, windows-2019, windows-2022]
+        os: [ubuntu-20.04, ubuntu-24.04-arm, macos-13, windows-2019, windows-2022]
         go-version: ["1.22.10", "1.23.4"]
-        exclude:
-          - os: ${{ github.repository != 'containerd/containerd' && 'arm64-8core-32gb' }}
     steps:
       - name: Install dependencies
-        if: matrix.os == 'ubuntu-20.04' || matrix.os == 'arm64-8core-32gb'
+        if: matrix.os == 'ubuntu-20.04' || matrix.os == 'ubuntu-24.04-arm'
         run: |
           sudo apt-get update
           sudo apt-get install -y libbtrfs-dev
@@ -354,19 +350,18 @@ 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]
+        os: [ubuntu-20.04, ubuntu-24.04-arm]
         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: arm64-8core-32gb
+            os: ubuntu-24.04-arm
           # shim.v1 doesn't support cgroupv2
           - runtime: io.containerd.runtime.v1.linux
-            os: arm64-8core-32gb
+            os: ubuntu-24.04-arm
 
     env:
       GOTEST: gotestsum --
@@ -386,10 +381,6 @@ jobs:
           script/setup/install-failpoint-binaries
 
       - name: Install criu
-        # NOTE: Required arm64 enable CONFIG_CHECKPOINT_RESTORE (need to confirm GitHub action runners config)
-        #
-        # REF: https://criu.org/Linux_kernel
-        if: matrix.os != 'arm64-8core-32gb'
         run: |
           sudo add-apt-repository ppa:criu/ppa
           sudo apt-get update
