From 81a68e39742bd2073dda26cd9e7f628b3819ee47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20Miku=C5=82a?= Date: Wed, 13 Jul 2022 01:04:30 +0200 Subject: [PATCH] It's a mess --- .github/workflows/cross-compile.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/cross-compile.yml b/.github/workflows/cross-compile.yml index 683105d53e..746df87cf2 100644 --- a/.github/workflows/cross-compile.yml +++ b/.github/workflows/cross-compile.yml @@ -36,6 +36,13 @@ jobs: - name: Add toolchain target run: rustup target add ${{ matrix.target }} + if: contains(matrix.target, 'gnullvm') == false + + - name: Add nightly toolchain with rust-src + run: | + rustup default ${{ matrix.version }} + rustup component add rust-src + if: startsWith(matrix.image, 'ubuntu-') && contains(matrix.target, 'gnullvm') && matrix.version == 'nightly' - name: Install gcc-mingw-w64-x86-64 run: sudo apt-get install -y gcc-mingw-w64-x86-64 @@ -69,4 +76,4 @@ jobs: if (-Not (Resolve-Path "target/*/debug/deps/test_win32-*.exe" | Test-Path)) { throw "Failed to find test_win32 executable." } - if: contains(matrix.target, 'gnullvm') + if: startsWith(matrix.image, 'ubuntu-') && contains(matrix.target, 'gnullvm') && matrix.version == 'nightly'