From ea8d8ae2f0e46aaa80674b028aa25dad06ed2b49 Mon Sep 17 00:00:00 2001 From: Jim Huang Date: Sun, 26 Jan 2025 16:00:04 +0800 Subject: [PATCH] CI: Use newer Aarch64/Linux host The run-on-arch-action [1] is outdated, resulting in several CI breakage. The fork [2] mainatined by @allinurl provides latest Ubuntu images for Aarch64, and it would be useful to align with x86-64 based CI images. Addressing CI infrastructure challenges, the run-on-arch-action [1] has become obsolete and is causing build failures. By adopting @allinurl's fork [2] with recent Ubuntu Aarch64 images, CI can be improved, ensuring consistent build environments across x86-64 and Arm platforms. In addition, gcc fails to build on Aarch64/Linux hosts, so clang is required for CI. [1] https://github.com/uraimo/run-on-arch-action [2] https://github.com/allinurl/run-on-arch-action --- .github/workflows/main.yml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d6ea6069..09066e32 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -152,16 +152,18 @@ jobs: uses: actions/checkout@v4 - name: build artifact # The GitHub Action for non-x86 CPU - # https://github.com/uraimo/run-on-arch-action - uses: uraimo/run-on-arch-action@v2 + uses: allinurl/run-on-arch-action@master + # FIXME: gcc build fails on Aarch64/Linux hosts + env: + CC: clang with: - arch: none - distro: none - base_image: "--platform=linux/arm64 arm64v8/ubuntu:22.04" + arch: aarch64 + distro: ubuntu24.04 # No 'sudo' is available install: | apt-get update -q -y - apt-get install -q -y git build-essential libsdl2-dev libsdl2-mixer-dev lsb-release wget software-properties-common gnupg bc + apt-get dist-upgrade -q -y + apt-get install -q -y make git clang libsdl2-dev libsdl2-mixer-dev lsb-release wget software-properties-common gnupg bc git config --global --add safe.directory ${{ github.workspace }} git config --global --add safe.directory ${{ github.workspace }}/src/softfloat git config --global --add safe.directory ${{ github.workspace }}/src/mini-gdbstub