From 8e4991a30e5d48ee94bddce85b880b1a2e2184b9 Mon Sep 17 00:00:00 2001 From: Lasse Dalegaard Date: Thu, 13 Jan 2022 22:26:18 +0100 Subject: [PATCH] Correct compilers for release --- .github/workflows/build_release.yml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build_release.yml b/.github/workflows/build_release.yml index 8f88d83..06a4d70 100644 --- a/.github/workflows/build_release.yml +++ b/.github/workflows/build_release.yml @@ -24,7 +24,7 @@ jobs: os: macos-11 raw_name: klipper_estimator asset_name: klipper_estimator_osx - - target: armv7-unknown-linux-gnueabihf + - target: armv7-unknown-linux-musleabihf os: ubuntu-latest raw_name: klipper_estimator asset_name: klipper_estimator_rpi @@ -33,11 +33,13 @@ jobs: env: RUST_BACKTRACE: full + CARGO_TARGET_ARMV7_UNKNOWN_LINUX_MUSLEABIHF_LINKER: arm-linux-gnueabihf-ld + CC_armv7_unknown_linux_musleabihf: arm-linux-gnueabihf-gcc steps: - uses: actions/checkout@v2 - name: Install Pi cross compiler - if: matrix.target == 'armv7-unknown-linux-gnueabihf' + if: matrix.target == 'armv7-unknown-linux-musleabihf' run: | sudo apt-get update sudo apt-get install gcc-arm-linux-gnueabihf @@ -46,11 +48,11 @@ jobs: run: | sudo apt-get update sudo apt-get install musl-tools - - name: Setup MSYS2 + - name: Setup mingw cross compiler if: matrix.target == 'x86_64-pc-windows-gnu' - uses: msys2/setup-msys2@v2 - with: - update: true + run: | + sudo apt-get update + sudo apt-get install gcc-mingw-w64-x86-64 - uses: actions/cache@v2 with: path: |