From a2cab3bae0027103141ec332a5b3a0e1ec6a184e Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Wed, 18 Sep 2024 15:27:02 +0200 Subject: [PATCH] ci: use `rustup` on Windows Signed-off-by: Roman Volosatovs --- .github/workflows/west.yml | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/.github/workflows/west.yml b/.github/workflows/west.yml index fa6c6c9..dfe15f2 100644 --- a/.github/workflows/west.yml +++ b/.github/workflows/west.yml @@ -27,11 +27,11 @@ jobs: - aarch64-unknown-linux-musl - aarch64-linux-android - riscv64gc-unknown-linux-gnu - - x86_64-pc-windows-gnu - x86_64-unknown-linux-musl - # TODO: figure out what's different in Mac libraries built this way + # TODO: figure out what's different in Mac/Windows libraries built this way #- aarch64-apple-darwin #- x86_64-apple-darwin + #- x86_64-pc-windows-gnu name: west-${{ matrix.target }} runs-on: ubuntu-latest @@ -44,10 +44,14 @@ jobs: with: package: west-${{ matrix.target }} - build-ffi-darwin: + build-ffi-rustup: strategy: matrix: config: + - os: windows-latest + lib: x86_64-windows + target: x86_64-pc-windows-gnu + - os: macos-13 lib: x86_64-darwin target: x86_64-apple-darwin @@ -109,7 +113,7 @@ jobs: name: test-release (${{ matrix.config.os }}) needs: - build-ffi - - build-ffi-darwin + - build-ffi-rustup - build-wasm runs-on: ${{ matrix.config.os }} steps: @@ -152,6 +156,13 @@ jobs: - uses: actions/setup-go@v5 with: go-version-file: 'go.mod' + - uses: msys2/setup-msys2@v2 + if: matrix.os == 'windows-latest' + with: + msystem: MINGW64 + update: true + install: git mingw-w64-x86_64-toolchain + path-type: inherit - run: rustup show - uses: Swatinem/rust-cache@v2.7.3 - uses: cargo-bins/cargo-binstall@v1.10.5