Skip to content

Commit

Permalink
Rollup merge of rust-lang#58854 - alexcrichton:update-windows, r=Mark…
Browse files Browse the repository at this point in the history
…-Simulacrum

appveyor: Use VS2017 for all our images

Originally added in rust-lang#55935 to test build times, this was reverted
in rust-lang#56201 due to a belief that it caused the exit code 259 spurious
errors. We've since learned, however, that the 259 exit code is likely
not related to this image update as we're getting it in a number of
locations now.

VS2017 looks like it may be required to compile LLVm in the near future,
notably discovered by rust-lang#58408 where we attempted to update LLVM.
  • Loading branch information
kennytm authored Mar 15, 2019
2 parents ad8e2b1 + 02b0085 commit 2bb8c9b
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
4 changes: 3 additions & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
environment:
# This is required for at least an AArch64 compiler in one image, and is also
# going to soon be required for compiling LLVM.
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 Preview

# By default schannel checks revocation of certificates unlike some other SSL
# backends, but we've historically had problems on CI where a revocation
Expand Down Expand Up @@ -81,7 +84,6 @@ environment:
DIST_REQUIRE_ALL_TOOLS: 1
DEPLOY: 1
CI_JOB_NAME: dist-x86_64-msvc
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 Preview
- RUST_CONFIGURE_ARGS: >
--build=i686-pc-windows-msvc
--target=i586-pc-windows-msvc
Expand Down
2 changes: 1 addition & 1 deletion src/llvm-project

0 comments on commit 2bb8c9b

Please sign in to comment.