Auto merge of #22756 - servo:jdm-patch-35, r=asajeffrey

Upgrade LLVM on windows.

- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] These changes fix #22636
- [x] There are tests for these changes

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/22756)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2019-01-24 18:50:26 -05:00 committed by GitHub
commit efecb3e1a2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions

View file

@ -1,5 +1,5 @@
version: 1.0.{build}
image: Previous Visual Studio 2017
image: Visual Studio 2017
environment:
CCACHE_DIR: "%APPVEYOR_BUILD_FOLDER%\\.ccache"

View file

@ -4,7 +4,7 @@
WINDOWS_MSVC = {
"cmake": "3.7.2",
"llvm": "6.0.0",
"llvm": "7.0.0",
"moztools": "3.2",
"ninja": "1.7.1",
"openssl": "1.1.0e-vs2015",