X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=appveyor.yml;h=ccb84fd3403fea683c9dc23a752701c7d8000a30;hb=88eb2a1f7e6277c7f10adfc95ebeaf3d2f73e862;hp=c2efa7e7d04acee1fb55585a21e2239454cecdd6;hpb=06b63f1f43fd11c9bbf4fe6d6699de27d4022a85;p=mesa.git

diff --git a/appveyor.yml b/appveyor.yml
index c2efa7e7d04..ccb84fd3403 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -33,29 +33,41 @@ branches:
 # - https://www.appveyor.com/blog/2014/06/04/shallow-clone-for-git-repositories
 clone_depth: 100
 
+# https://www.appveyor.com/docs/build-cache/
 cache:
-- win_flex_bison-2.4.5.zip
-- llvm-3.3.1-msvc2013-mtd.7z
+- '%LOCALAPPDATA%\pip\Cache -> appveyor.yml'
+- win_flex_bison-2.5.15.zip
+- llvm-5.0.1-msvc2017-mtd.7z
 
-os: Visual Studio 2013
+os: Visual Studio 2017
+
+init:
+# Appveyor defaults core.autocrlf to input instead of the default (true), but
+# that can hide problems processing CRLF text on Windows
+- git config --global core.autocrlf true
 
 environment:
-  WINFLEXBISON_ARCHIVE: win_flex_bison-2.4.5.zip
-  LLVM_ARCHIVE: llvm-3.3.1-msvc2013-mtd.7z
+  WINFLEXBISON_VERSION: 2.5.15
+  LLVM_ARCHIVE: llvm-5.0.1-msvc2017-mtd.7z
 
 install:
+# Check git config
+- git config core.autocrlf
 # Check pip
 - python --version
 - python -m pip --version
 # Install Mako
-- python -m pip install --egg Mako
+- python -m pip install Mako==1.0.7
 # Install pywin32 extensions, needed by SCons
 - python -m pip install pypiwin32
+# Install python wheels, necessary to install SCons via pip
+- python -m pip install wheel
 # Install SCons
-- python -m pip install --egg scons==2.4.1
+- python -m pip install scons==3.0.1
 - scons --version
 # Install flex/bison
-- if not exist "%WINFLEXBISON_ARCHIVE%" appveyor DownloadFile "http://downloads.sourceforge.net/project/winflexbison/%WINFLEXBISON_ARCHIVE%"
+- set WINFLEXBISON_ARCHIVE=win_flex_bison-%WINFLEXBISON_VERSION%.zip
+- if not exist "%WINFLEXBISON_ARCHIVE%" appveyor DownloadFile "https://github.com/lexxmark/winflexbison/releases/download/v%WINFLEXBISON_VERSION%/%WINFLEXBISON_ARCHIVE%"
 - 7z x -y -owinflexbison\ "%WINFLEXBISON_ARCHIVE%" > nul
 - set Path=%CD%\winflexbison;%Path%
 - win_flex --version
@@ -67,10 +79,10 @@ install:
 - set LLVM=%CD%\llvm
 
 build_script:
-- scons -j%NUMBER_OF_PROCESSORS% MSVC_VERSION=12.0 llvm=1
+- scons -j%NUMBER_OF_PROCESSORS% MSVC_VERSION=14.1 llvm=1
 
 after_build:
-- scons -j%NUMBER_OF_PROCESSORS% MSVC_VERSION=12.0 llvm=1 check
+- scons -j%NUMBER_OF_PROCESSORS% MSVC_VERSION=14.1 llvm=1 check
 
 
 # It's possible to setup notification here, as described in