X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=appveyor.yml;h=f66689ea4bbc25c4e82c54c0d42a6f9fde881917;hb=e7908a95f9643c377df0d0f9021e509b3e4a2fe8;hp=ccb84fd3403fea683c9dc23a752701c7d8000a30;hpb=65b8d723fde7e63f703e76400d2c6ad0068e462f;p=mesa.git

diff --git a/appveyor.yml b/appveyor.yml
index ccb84fd3403..f66689ea4bb 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -38,8 +38,9 @@ cache:
 - '%LOCALAPPDATA%\pip\Cache -> appveyor.yml'
 - win_flex_bison-2.5.15.zip
 - llvm-5.0.1-msvc2017-mtd.7z
+- subprojects\packagecache -> subprojects\*.wrap
 
-os: Visual Studio 2017
+os: Visual Studio 2019
 
 init:
 # Appveyor defaults core.autocrlf to input instead of the default (true), but
@@ -47,43 +48,21 @@ init:
 - git config --global core.autocrlf true
 
 environment:
+  Path: C:\Python38-x64;C:\Python38-x64\Scripts;%Path%
   WINFLEXBISON_VERSION: 2.5.15
   LLVM_ARCHIVE: llvm-5.0.1-msvc2017-mtd.7z
+  matrix:
+  - compiler: msvc
+    buildsystem: scons
 
 install:
-# Check git config
-- git config core.autocrlf
-# Check pip
-- python --version
-- python -m pip --version
-# Install 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 scons==3.0.1
-- scons --version
-# Install flex/bison
-- 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
-- if not exist "%LLVM_ARCHIVE%" appveyor DownloadFile "https://people.freedesktop.org/~jrfonseca/llvm/%LLVM_ARCHIVE%"
-- 7z x -y "%LLVM_ARCHIVE%" > nul
-- mkdir llvm\bin
-- set LLVM=%CD%\llvm
+- cmd: .appveyor\appveyor_msvc.bat install
 
 build_script:
-- 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
+- cmd: .appveyor\appveyor_msvc.bat build_script
 
+test_script:
+- cmd: .appveyor\appveyor_msvc.bat test_script
 
 # It's possible to setup notification here, as described in
 # http://www.appveyor.com/docs/notifications#appveyor-yml-configuration , but