diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e9483bf5e..e49626c8b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,25 +18,21 @@ jobs: linux-gcc-loongarch64: runs-on: ubuntu-24.04 + container: amd64/ubuntu:24.10 steps: - uses: actions/checkout@v4 - name: CPU Information run: cat /proc/cpuinfo - name: Install APT Dependencies run: | - sudo apt-get install -y ninja-build ninja-build meson qemu-user-static - - name: Download and install loongarch64-toolchain - run: | - wget https://github.com/loongson/build-tools/releases/download/2024.08.08/x86_64-cross-tools-loongarch64-binutils_2.43-gcc_14.2.0-glibc_2.40.tar.xz - tar -xf x86_64-cross-tools-loongarch64-binutils_2.43-gcc_14.2.0-glibc_2.40.tar.xz -C /opt + apt-get update && apt-get install -y --no-install-recommends \ + ninja-build ninja-build meson qemu-user-static binfmt-support \ + libc6-loong64-cross libstdc++-14-dev-loong64-cross \ + gcc-14-loongarch64-linux-gnu g++-14-loongarch64-linux-gnu - name: ccache uses: hendrikmuhs/ccache-action@v1.2 with: - key: ${{ github.job }}-binutils_2.43-gcc_14.2.0-glibc_2.40 - - name: set env - run: | - echo "LD_LIBRARY_PATH=/opt/cross-tools/target/usr/lib64:/opt/cross-tools/loongarch64-unknown-linux-gnu/lib:$LD_LIBRARY_PATH" >> $GITHUB_ENV - echo "PATH=$GITHUB_WORKSPACE:/opt/cross-tools/bin:$PATH" >> $GITHUB_ENV + key: ${{ github.job }} # - name: Disable SVML tests # run: | # sed -i "/svml/d" test/x86/meson.build diff --git a/docker/cross-files/loongarch64-gcc-14-ccache.cross b/docker/cross-files/loongarch64-gcc-14-ccache.cross index 9abfb11ee..b01f9544b 100644 --- a/docker/cross-files/loongarch64-gcc-14-ccache.cross +++ b/docker/cross-files/loongarch64-gcc-14-ccache.cross @@ -1,11 +1,11 @@ [binaries] -c = ['ccache', 'loongarch64-unknown-linux-gnu-gcc'] -cpp = ['ccache', 'loongarch64-unknown-linux-gnu-g++'] -ar = 'loongarch64-unknown-linux-gnu-ar' -strip = 'loongarch64-unknown-linux-gnu-strip' -objcopy = 'loongarch64-unknown-linux-gnu-objcopy' -ld = 'loongarch64-unknown-linux-gnu-ld' -exe_wrapper = ['qemu-loongarch64-static', '-L', '/opt/cross-tools/target/usr', '-cpu', 'la464'] +c = ['ccache', 'loongarch64-linux-gnu-gcc-14'] +cpp = ['ccache', 'loongarch64-linux-gnu-g++-14'] +ar = 'loongarch64-linux-gnu-gcc-ar-14' +strip = 'loongarch64-linux-gnu-strip' +objcopy = 'loongarch64-linux-gnu-objcopy' +ld = 'loongarch64-linux-gnu-ld' +exe_wrapper = ['qemu-loongarch64-static', '-L', '/usr/loongarch64-linux-gnu/', '-cpu', 'la464'] [properties] c_args = ['-march=loongarch64', '-Wextra', '-Werror', '-mlsx']