Merge pull request #34717 from madmiraal/update-appveyor2

Use current versions of software in Appveyor.
This commit is contained in:
Rémi Verschelde 2020-01-09 12:39:05 +01:00 committed by GitHub
commit be97c4cd48
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,16 +1,16 @@
os: Visual Studio 2015 image: Visual Studio 2019
platform: x64
environment: environment:
HOME: "%HOMEDRIVE%%HOMEPATH%" HOME: "%HOMEDRIVE%%HOMEPATH%"
PYTHON: C:\Python27 PYTHON: C:\Python38
SCONS_CACHE_ROOT: "%HOME%\\scons_cache" SCONS_CACHE_ROOT: "%HOME%\\scons_cache"
SCONS_CACHE_LIMIT: 1024 SCONS_CACHE_LIMIT: 1024
matrix: matrix:
- VS: C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat - GD_PLATFORM: windows
GD_PLATFORM: windows
TOOLS: yes TOOLS: yes
TARGET: release_debug TARGET: release_debug
ARCH: amd64
init: init:
- ps: if ($env:APPVEYOR_REPO_BRANCH -ne "master") { $env:APPVEYOR_CACHE_SKIP_SAVE = "true" } - ps: if ($env:APPVEYOR_REPO_BRANCH -ne "master") { $env:APPVEYOR_CACHE_SKIP_SAVE = "true" }
@ -20,15 +20,12 @@ cache:
install: install:
- SET "PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%" - SET "PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
- pip install -U wheel # needed for pip install scons to work, otherwise a flag is missing - pip install scons==3.1.2
- pip install scons==3.0.1
- if defined VS call "%VS%" %ARCH% # if defined - so we can also use mingw
before_build: before_build:
- echo %GD_PLATFORM% - echo %GD_PLATFORM%
- python --version - python --version
- scons --version - scons --version
- cl.exe
- set "SCONS_CACHE=%SCONS_CACHE_ROOT%\%APPVEYOR_REPO_BRANCH%" - set "SCONS_CACHE=%SCONS_CACHE_ROOT%\%APPVEYOR_REPO_BRANCH%"
build_script: build_script: