X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=appveyor.yml;h=ccb84fd3403fea683c9dc23a752701c7d8000a30;hb=6ab83b84749d91a886653ab6bcb51ad2d5040c07;hp=84dc4de36b32ddf61f90b8f227943248d4c3183e;hpb=9e6af56666201d97ae0fcf068aa2f08c6737482f;p=mesa.git

diff --git a/appveyor.yml b/appveyor.yml
index 84dc4de36b3..ccb84fd3403 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -6,7 +6,7 @@
 # - Select Git and fill in the Git clone URL
 # - Setup a Git hook as explained in
 #   https://github.com/appveyor/webhooks#installing-git-hook
-# - Check 'Settings > General > Skip branches without appveyor'
+# - Check 'Settings > General > Skip branches without appveyor.yml'
 # - Check 'Settings > General > Rolling builds'
 # - Setup the global or project notifications to your liking
 #
@@ -24,25 +24,52 @@ branches:
   except:
   - /^travis.*$/
 
-clone_depth: 5
+# Don't download the full Mesa history to speed up cloning.  However the clone
+# depth must not be too small, otherwise builds might fail when lots of patches
+# are committed in succession, because the desired commit is not found on the
+# truncated history.
+#
+# See also:
+# - https://www.appveyor.com/blog/2014/06/04/shallow-clone-for-git-repositories
+clone_depth: 100
 
+# https://www.appveyor.com/docs/build-cache/
 cache:
-- 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 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:
-  LLVM_ARCHIVE: llvm-3.3.1-msvc2013-mtd.7z
+  WINFLEXBISON_VERSION: 2.5.15
+  LLVM_ARCHIVE: llvm-5.0.1-msvc2017-mtd.7z
 
 install:
-# Install pip
+# Check git config
+- git config core.autocrlf
+# Check pip
 - python --version
-- python -m ensurepip
+- 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
-- cinst winflexbison -y
+- 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
 - win_bison --version
 # Download and extract LLVM
@@ -52,7 +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=14.1 llvm=1 check
 
 
 # It's possible to setup notification here, as described in