From 390d0c8b0969a6e8e1a73b38831bf55e7c845527 Mon Sep 17 00:00:00 2001 From: David Michael Barr Date: Wed, 13 Dec 2023 16:03:33 +0900 Subject: [PATCH] CI: Use MSYS2 toolchain for x86_64-pc-windows-gnu --- .github/workflows/deploy.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 94fbe8a32b..4a4ff1756f 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -95,14 +95,23 @@ jobs: with: toolchain: ${{ matrix.toolchain }} + - name: Install mingw-w64-x86_64-binutils and mingw-w64-x86_64-gcc + run: | + C:\msys64\usr\bin\pacman.exe --noconfirm --needed -S mingw-w64-x86_64-binutils mingw-w64-x86_64-gcc + if: contains(matrix.toolchain, 'windows-gnu') + - name: Build rav1e env: RUSTFLAGS: "-C target-cpu=${{ matrix.target_cpu }}" + CARGO_TARGET_X86_64_PC_WINDOWS_GNU_LINKER: "C:\\msys64\\mingw64\\bin\\x86_64-w64-mingw32-gcc.exe" + CARGO_TARGET_X86_64_PC_WINDOWS_GNU_AR: "C:\\msys64\\mingw64\\bin\\ar.exe" run: cargo build --profile ${{ matrix.profile }} - name: Run cargo-c env: RUSTFLAGS: "-C target-cpu=${{ matrix.target_cpu }}" + CARGO_TARGET_X86_64_PC_WINDOWS_GNU_LINKER: "C:\\msys64\\mingw64\\bin\\x86_64-w64-mingw32-gcc.exe" + CARGO_TARGET_X86_64_PC_WINDOWS_GNU_AR: "C:\\msys64\\mingw64\\bin\\ar.exe" run: | cargo fetch cargo cinstall --profile ${{ matrix.profile }} --destdir="C:\" --offline