diff options
| author | bors <bors@rust-lang.org> | 2020-08-11 19:29:38 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-08-11 19:29:38 +0000 |
| commit | e5e33ebd2ba12a78dbf6e2d5f154d5f71f28576c (patch) | |
| tree | 2400d5f1c2b7830eb3ccb38bb3837ca128159421 /src/ci | |
| parent | cbe7c5ce705896d4e22bf6096590bc1f17993b78 (diff) | |
| parent | 5d9a0b020c8f85c78b4bb7071e993a9d00db07e7 (diff) | |
| download | rust-e5e33ebd2ba12a78dbf6e2d5f154d5f71f28576c.tar.gz rust-e5e33ebd2ba12a78dbf6e2d5f154d5f71f28576c.zip | |
Auto merge of #75421 - tmandry:rollup-ctzmzn1, r=tmandry
Rollup of 7 pull requests Successful merges: - #75036 (Prefer pattern matching over indexing) - #75378 (Introduce `rustc_lexer::is_ident` and use it in couple of places) - #75393 (Fully handle "?" shortcut) - #75403 (Update comment for function) - #75407 (Requested changes to [*mut T|*const T]::set_ptr_value) - #75408 (Update MinGW comments in ci.yml) - #75409 (Fix range term in alloc vec doc) Failed merges: r? @ghost
Diffstat (limited to 'src/ci')
| -rw-r--r-- | src/ci/github-actions/ci.yml | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml index 0ff77de003d..165ecc79180 100644 --- a/src/ci/github-actions/ci.yml +++ b/src/ci/github-actions/ci.yml @@ -490,15 +490,17 @@ jobs: # 32/64-bit MinGW builds. # - # We are using MinGW with posix threads since LLVM does not compile with - # the win32 threads version due to missing support for C++'s std::thread. + # We are using MinGW with POSIX threads since LLVM requires + # C++'s std::thread which is disabled in libstdc++ with win32 threads. + # FIXME: Libc++ doesn't have this limitation so we can avoid + # winpthreads if we switch to it. # - # Instead of relying on the MinGW version installed on appveryor we download - # and install one ourselves so we won't be surprised by changes to appveyor's + # Instead of relying on the MinGW version installed on CI we download + # and install one ourselves so we won't be surprised by changes to CI's # build image. # # Finally, note that the downloads below are all in the `rust-lang-ci` S3 - # bucket, but they cleraly didn't originate there! The downloads originally + # bucket, but they clearly didn't originate there! The downloads originally # came from the mingw-w64 SourceForge download site. Unfortunately # SourceForge is notoriously flaky, so we mirror it on our own infrastructure. |