about summary refs log tree commit diff
diff options
context:
space:
mode:
authorCaleb Cartwright <caleb.cartwright@outlook.com>2021-01-01 10:46:20 -0600
committerCaleb Cartwright <calebcartwright@users.noreply.github.com>2021-01-09 12:11:52 -0600
commitd8e0d00377a77a721c2bae4cf64ce3d5bfcccc42 (patch)
treeac2331832f48566125c41afa99db9a66bd33cd70
parentacd94866fd0ff5eacb7e184ae21c19e5440fc5fb (diff)
downloadrust-d8e0d00377a77a721c2bae4cf64ce3d5bfcccc42.tar.gz
rust-d8e0d00377a77a721c2bae4cf64ce3d5bfcccc42.zip
ci: fix linking issue on windows gnu jobs
-rw-r--r--.github/workflows/windows.yml13
1 files changed, 12 insertions, 1 deletions
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 0b78d63aaf7..156848c1650 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -14,7 +14,7 @@ jobs:
       # There's a limit of 60 concurrent jobs across all repos in the rust-lang organization.
       # In order to prevent overusing too much of that 60 limit, we throttle the
       # number of rustfmt jobs that will run concurrently.
-      max-parallel: 1
+      max-parallel: 2
       fail-fast: false
       matrix:
         target: [
@@ -50,6 +50,17 @@ jobs:
         profile: minimal
         default: true
 
+    - name: Add mingw32 to path for i686-gnu
+      run: |
+        echo "C:\msys64\mingw32\bin" >> $GITHUB_PATH
+      if: matrix.target == 'i686-pc-windows-gnu' && matrix.channel == 'nightly'
+      shell: bash
+
+    - name: Add mingw64 to path for x86_64-gnu
+      run: echo "C:\msys64\mingw64\bin" >> $GITHUB_PATH
+      if: matrix.target == 'x86_64-pc-windows-gnu' && matrix.channel == 'nightly'
+      shell: bash
+
     - name: cargo-make
       run: cargo install --force cargo-make