Merge pull request #6093 from xmake-io/ci

improve linux arm64 ci

3 files changed, 35 insertions, 72 deletions

diff --git a/.github/workflows/linux_arm64.yml b/.github/workflows/linux_arm64.yml
new file mode 100644
index 000000000..c25081ef0
--- /dev/null
+++ b/.github/workflows/linux_arm64.yml
@@ -0,0 +1,35 @@
+name: Linux (Arm64)
+
+on:
+  pull_request:
+  push:
+  release:
+    types: [published]
+
+jobs:
+  build:
+    runs-on: ubuntu-24.04-arm
+
+    concurrency:
+        group: ${{ github.ref }}-${{ github.base_ref }}-${{ github.head_ref }}-Ubuntu-Arm64
+        cancel-in-progress: true
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          submodules: true
+      - name: prepare local xmake
+        run: cp -rf . ../xmake-source
+      - uses: xmake-io/github-action-setup-xmake@v1
+        with:
+          xmake-version: local#../xmake-source
+
+      - name: Prepare
+        run: |
+          sudo apt update
+          sudo apt install -y unzip build-essential llvm libc++-dev
+
+      - name: Tests
+        run: |
+          xmake lua -v -D tests/run.lua
+          xrepo --version
+
diff --git a/.github/workflows/ubuntu_arm.yml b/.github/workflows/ubuntu_arm.yml
deleted file mode 100644
index ad8a6f229..000000000
--- a/.github/workflows/ubuntu_arm.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-name: Ubuntu (Arm)
-
-on:
-  pull_request:
-  push:
-  release:
-    types: [published]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    concurrency:
-        group: ${{ github.ref }}-${{ github.base_ref }}-${{ github.head_ref }}-UbuntuArm
-        cancel-in-progress: true
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          submodules: true
-
-      - run: |
-          docker run --rm --privileged multiarch/qemu-user-static:register --reset
-
-      - uses: docker://multiarch/ubuntu-core:armhf-bionic
-        with:
-          args: >
-            bash -c
-            "uname -a &&
-            apt update && apt install -y unzip &&
-            cd /github/workspace &&
-            ./scripts/get.sh __local__ &&
-            source ~/.xmake/profile &&
-            export XMAKE_ROOT=y &&
-            export XMAKE_TMPDIR=/tmp &&
-            xmake lua -v -D tests/run.lua && xrepo --version"
-
diff --git a/.github/workflows/ubuntu_arm64.yml b/.github/workflows/ubuntu_arm64.yml
deleted file mode 100644
index c2b6d4370..000000000
--- a/.github/workflows/ubuntu_arm64.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-name: Ubuntu (Arm64)
-
-on:
-  pull_request:
-  push:
-  release:
-    types: [published]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    concurrency:
-        group: ${{ github.ref }}-${{ github.base_ref }}-${{ github.head_ref }}-UbuntuArm64
-        cancel-in-progress: true
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          submodules: true
-
-      - run: |
-          docker run --rm --privileged multiarch/qemu-user-static:register --reset
-
-      - uses: docker://multiarch/ubuntu-core:arm64-bionic
-        with:
-          args: >
-            bash -c
-            "uname -a &&
-            apt update && apt install -y unzip &&
-            cd /github/workspace &&
-            ./scripts/get.sh __local__ &&
-            source ~/.xmake/profile &&
-            export XMAKE_ROOT=y &&
-            export XMAKE_TMPDIR=/tmp &&
-            xmake lua -v -D tests/run.lua && xrepo --version"
-