From 5f68cc48aa29f2b0d27d0373e7bd90b0ab128365 Mon Sep 17 00:00:00 2001 From: c8ef Date: Sat, 7 Sep 2024 13:05:15 +0800 Subject: [PATCH] update cross toolchain (#5161) --- .github/workflows/cross_musl.yml | 13 ++++++------- packages/a/async_simple/xmake.lua | 1 - 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/.github/workflows/cross_musl.yml b/.github/workflows/cross_musl.yml index 7a1b3917daf..84b7a262321 100644 --- a/.github/workflows/cross_musl.yml +++ b/.github/workflows/cross_musl.yml @@ -10,13 +10,13 @@ jobs: strategy: matrix: os: [ubuntu-latest] - cross: [arm-linux-musleabi, aarch64-linux-musl] + cross: [arm-unknown-linux-musleabi, aarch64-unknown-linux-musl] runs-on: ${{ matrix.os }} concurrency: - group: ${{ github.ref }}-${{ github.base_ref }}-${{ github.head_ref }}-Cross-Musl-${{ matrix.cross }} - cancel-in-progress: true + group: ${{ github.ref }}-${{ github.base_ref }}-${{ github.head_ref }}-Cross-Musl-${{ matrix.cross }} + cancel-in-progress: true steps: - uses: actions/checkout@v1 - uses: xmake-io/github-action-setup-xmake@v1 @@ -25,10 +25,9 @@ jobs: - name: Installation run: | - wget https://github.com/xmake-mirror/musl.cc/releases/download/20210202/${{ matrix.cross }}-cross.linux.tgz - tar -xvf ${{ matrix.cross }}-cross.linux.tgz + wget https://github.com/musl-cross/musl-cross/releases/download/20240903/${{ matrix.cross }}.tgz + tar -xvf ${{ matrix.cross }}.tgz - name: Tests run: | - xmake l ./scripts/test.lua -D -p cross --toolchain=muslcc --sdk=`pwd`/${{ matrix.cross }}-cross - + xmake l ./scripts/test.lua -D -p cross --toolchain=muslcc --sdk=`pwd`/${{ matrix.cross }} diff --git a/packages/a/async_simple/xmake.lua b/packages/a/async_simple/xmake.lua index a447282e305..0b7598b5db9 100644 --- a/packages/a/async_simple/xmake.lua +++ b/packages/a/async_simple/xmake.lua @@ -44,7 +44,6 @@ package("async_simple") on_test(function (package) assert(package:check_cxxsnippets({test = [[ - #include async_simple::coro::Lazy func() { co_return; }