summary refs log tree commit diff
path: root/.github/workflows
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2020-07-26 16:09:42 +0000
committerbors <bors@rust-lang.org>2020-07-26 16:09:42 +0000
commitc367798cfd3817ca6ae908ce675d1d99242af148 (patch)
tree3c697026c11f13b35d61371c36921e6b3d1de1ca /.github/workflows
parent14485ee1257703df51313efe39daf35e886e4dac (diff)
parent41895ca93f3722adf5855089442de3abc94458f0 (diff)
downloadrust-1.45.1.tar.gz
rust-1.45.1.zip
Auto merge of #74746 - wesleywiser:stable_backport_73669, r=Mark-Simulacrum 1.45.1
Stable backport of #73613

This is the backport of #73613 to stable.

r? @ghost

cc @Mark-Simulacrum

In addition the tests added in the original PR passing, I've also confirmed that the test case in #74739 works correctly.
Diffstat (limited to '.github/workflows')
-rw-r--r--.github/workflows/ci.yml9
1 files changed, 0 insertions, 9 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3006e61b818..68b779347dd 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -101,9 +101,6 @@ jobs:
       - name: install MSYS2
         run: src/ci/scripts/install-msys2.sh
         if: success() && !env.SKIP_JOB
-      - name: install MSYS2 packages
-        run: src/ci/scripts/install-msys2-packages.sh
-        if: success() && !env.SKIP_JOB
       - name: install MinGW
         run: src/ci/scripts/install-mingw.sh
         if: success() && !env.SKIP_JOB
@@ -210,9 +207,6 @@ jobs:
       - name: install MSYS2
         run: src/ci/scripts/install-msys2.sh
         if: success() && !env.SKIP_JOB
-      - name: install MSYS2 packages
-        run: src/ci/scripts/install-msys2-packages.sh
-        if: success() && !env.SKIP_JOB
       - name: install MinGW
         run: src/ci/scripts/install-mingw.sh
         if: success() && !env.SKIP_JOB
@@ -561,9 +555,6 @@ jobs:
       - name: install MSYS2
         run: src/ci/scripts/install-msys2.sh
         if: success() && !env.SKIP_JOB
-      - name: install MSYS2 packages
-        run: src/ci/scripts/install-msys2-packages.sh
-        if: success() && !env.SKIP_JOB
       - name: install MinGW
         run: src/ci/scripts/install-mingw.sh
         if: success() && !env.SKIP_JOB