From cf6f9d0842fbbc786d8b2908f5948c6d282e1b20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=AA=E3=81=A4=E3=81=8D?= <i@ntk.me>
Date: Wed, 12 Jun 2024 13:49:16 -0700
Subject: [PATCH] Build AOT releases with native arm64 runners (#2262)

---
 .github/workflows/build-android.yml    |  7 ++++++-
 .github/workflows/build-linux-musl.yml | 13 +++++++------
 .github/workflows/build-linux.yml      | 13 +++++++++----
 .github/workflows/build-macos.yml      |  2 +-
 .github/workflows/build-windows.yml    |  2 +-
 5 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/build-android.yml b/.github/workflows/build-android.yml
index e8ccdd7dc..90405bbd0 100644
--- a/.github/workflows/build-android.yml
+++ b/.github/workflows/build-android.yml
@@ -8,7 +8,7 @@ jobs:
   build:
     name: Build
 
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.runner }}
 
     strategy:
       fail-fast: false
@@ -16,19 +16,24 @@ jobs:
         include:
           - arch: x64
             lib: lib64
+            runner: ubuntu-latest
             platform: linux/amd64
           - arch: ia32
             lib: lib
+            runner: ubuntu-latest
             platform: linux/amd64
           - arch: arm64
             lib: lib64
+            runner: linux-arm64
             platform: linux/arm64
           - arch: arm
             lib: lib
+            runner: linux-arm64
             platform: linux/arm64
           # There is no docker image for riscv64 dart-sdk, build kernel snapshot instead.
           - arch: riscv64
             lib: lib64
+            runner: ubuntu-latest
             platform: linux/amd64 # linux/riscv64
 
     steps:
diff --git a/.github/workflows/build-linux-musl.yml b/.github/workflows/build-linux-musl.yml
index 024820e34..aa33b4eff 100644
--- a/.github/workflows/build-linux-musl.yml
+++ b/.github/workflows/build-linux-musl.yml
@@ -8,25 +8,26 @@ jobs:
   build:
     name: Build
 
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.runner }}
 
     strategy:
       fail-fast: false
       matrix:
         include:
           - arch: x64
+            runner: ubuntu-latest
             platform: linux/amd64
           - arch: ia32
+            runner: ubuntu-latest
             platform: linux/386
           - arch: arm64
+            runner: linux-arm64
             platform: linux/arm64
-          # There is a bug in qemu's mremap causing pthread_getattr_np in musl to stuck in a loop on arm.
-          # Unless qemu fixes the bug or we get a real linux-arm runner, we cannot build aot-snapshot
-          # for arm on CI. So, we create a kernel snapshot for arm build in amd64 container instead.
-          # https://gitlab.com/qemu-project/qemu/-/issues/1729
           - arch: arm
-            platform: linux/amd64 # linux/arm/v7
+            runner: linux-arm64
+            platform: linux/arm/v7
           - arch: riscv64
+            runner: ubuntu-latest
             platform: linux/riscv64
 
     steps:
diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build-linux.yml
index 308c5ec58..bf28d809f 100644
--- a/.github/workflows/build-linux.yml
+++ b/.github/workflows/build-linux.yml
@@ -8,21 +8,26 @@ jobs:
   build:
     name: Build
 
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.runner }}
 
     strategy:
       fail-fast: false
       matrix:
         include:
           - arch: x64
+            runner: ubuntu-latest
             platform: linux/amd64
           - arch: ia32
-            platform: linux/amd64
-          - arch: arm
-            platform: linux/arm/v7
+            runner: ubuntu-latest
+            platform: linux/386
           - arch: arm64
+            runner: linux-arm64
             platform: linux/arm64
+          - arch: arm
+            runner: linux-arm64
+            platform: linux/arm/v7
           - arch: riscv64
+            runner: ubuntu-latest
             platform: linux/riscv64
 
     steps:
diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml
index 3dff23d3b..660ceadfa 100644
--- a/.github/workflows/build-macos.yml
+++ b/.github/workflows/build-macos.yml
@@ -17,7 +17,7 @@ jobs:
           - arch: x64
             runner: macos-13
           - arch: arm64
-            runner: macos-14
+            runner: macos-latest
 
     steps:
       - uses: actions/checkout@v4
diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml
index ba9ff8bb1..86ea17c22 100644
--- a/.github/workflows/build-windows.yml
+++ b/.github/workflows/build-windows.yml
@@ -19,7 +19,7 @@ jobs:
           - arch: ia32
             runner: windows-latest
           - arch: arm64
-            runner: windows-latest
+            runner: windows-arm64
 
     steps:
       - uses: actions/checkout@v4