From 146464f99bf99012097fe0cee3b82b858a84d7ad Mon Sep 17 00:00:00 2001 From: c8ef Date: Sat, 28 Sep 2024 11:18:39 +0800 Subject: [PATCH] update cross --- .github/workflows/{cross_musl.yml => cross.yml} | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) rename .github/workflows/{cross_musl.yml => cross.yml} (51%) diff --git a/.github/workflows/cross_musl.yml b/.github/workflows/cross.yml similarity index 51% rename from .github/workflows/cross_musl.yml rename to .github/workflows/cross.yml index 84b7a262321..9a3ba6758dd 100644 --- a/.github/workflows/cross_musl.yml +++ b/.github/workflows/cross.yml @@ -1,4 +1,4 @@ -name: Cross (Musl) +name: Cross on: pull_request: @@ -10,12 +10,12 @@ jobs: strategy: matrix: os: [ubuntu-latest] - cross: [arm-unknown-linux-musleabi, aarch64-unknown-linux-musl] + cross: [arm-none-linux-gnueabihf, aarch64-none-linux-gnu] runs-on: ${{ matrix.os }} concurrency: - group: ${{ github.ref }}-${{ github.base_ref }}-${{ github.head_ref }}-Cross-Musl-${{ matrix.cross }} + group: ${{ github.ref }}-${{ github.base_ref }}-${{ github.head_ref }}-Cross-${{ matrix.cross }} cancel-in-progress: true steps: - uses: actions/checkout@v1 @@ -25,9 +25,9 @@ jobs: - name: Installation run: | - wget https://github.com/musl-cross/musl-cross/releases/download/20240903/${{ matrix.cross }}.tgz - tar -xvf ${{ matrix.cross }}.tgz + wget https://developer.arm.com/-/media/Files/downloads/gnu/13.3.rel1/binrel/arm-gnu-toolchain-13.3.rel1-x86_64-${{ matrix.cross }}.tar.xz + tar -xvf arm-gnu-toolchain-13.3.rel1-x86_64-${{ matrix.cross }}.tar.xz - name: Tests run: | - xmake l ./scripts/test.lua -D -p cross --toolchain=muslcc --sdk=`pwd`/${{ matrix.cross }} + xmake l ./scripts/test.lua -D -p cross --sdk=`pwd`/arm-gnu-toolchain-13.3.rel1-x86_64-${{ matrix.cross }}