Skip to content

Commit 32a2d73

Browse files
committedMar 27, 2017
Auto merge of #40867 - alexcrichton:rollup, r=alexcrichton
Rollup of 19 pull requests - Successful merges: #40317, #40516, #40524, #40606, #40683, #40751, #40778, #40813, #40818, #40819, #40824, #40828, #40832, #40833, #40837, #40849, #40852, #40853, #40865 - Failed merges:
2 parents ccce2c6 + 61928a0 commit 32a2d73

File tree

93 files changed

+974
-592
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

93 files changed

+974
-592
lines changed
 

‎appveyor.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,13 @@ environment:
4646
RUST_CONFIGURE_ARGS: --build=i686-pc-windows-gnu --enable-ninja
4747
SCRIPT: python x.py test
4848
MINGW_URL: https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror
49-
MINGW_ARCHIVE: i686-6.3.0-release-win32-dwarf-rt_v5-rev1.7z
49+
MINGW_ARCHIVE: i686-6.2.0-release-win32-dwarf-rt_v5-rev1.7z
5050
MINGW_DIR: mingw32
5151
- MSYS_BITS: 64
5252
SCRIPT: python x.py test
5353
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-gnu --enable-ninja
5454
MINGW_URL: https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror
55-
MINGW_ARCHIVE: x86_64-6.3.0-release-win32-seh-rt_v5-rev1.7z
55+
MINGW_ARCHIVE: x86_64-6.2.0-release-win32-seh-rt_v5-rev1.7z
5656
MINGW_DIR: mingw64
5757

5858
# 32/64 bit MSVC and GNU deployment
@@ -71,14 +71,14 @@ environment:
7171
RUST_CONFIGURE_ARGS: --build=i686-pc-windows-gnu --enable-extended --enable-ninja
7272
SCRIPT: python x.py dist
7373
MINGW_URL: https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror
74-
MINGW_ARCHIVE: i686-6.3.0-release-win32-dwarf-rt_v5-rev1.7z
74+
MINGW_ARCHIVE: i686-6.2.0-release-win32-dwarf-rt_v5-rev1.7z
7575
MINGW_DIR: mingw32
7676
DEPLOY: 1
7777
- MSYS_BITS: 64
7878
SCRIPT: python x.py dist
7979
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-gnu --enable-extended --enable-ninja
8080
MINGW_URL: https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror
81-
MINGW_ARCHIVE: x86_64-6.3.0-release-win32-seh-rt_v5-rev1.7z
81+
MINGW_ARCHIVE: x86_64-6.2.0-release-win32-seh-rt_v5-rev1.7z
8282
MINGW_DIR: mingw64
8383
DEPLOY: 1
8484

0 commit comments

Comments
 (0)