Skip to content

Commit bedc45c

Browse files
committed
Disable build matrix for debug, add VS2017 workaround
1 parent 6dded50 commit bedc45c

File tree

2 files changed

+66
-56
lines changed

2 files changed

+66
-56
lines changed

.appveyor.yml

Lines changed: 56 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -3,65 +3,65 @@ version: 1.3.5-{build}
33
environment:
44
matrix:
55

6-
- PHP_VERSION: 7.0
7-
VC_VERSION: 14
8-
BUILD_TYPE: "Win32"
9-
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
10-
11-
- PHP_VERSION: 7.0
12-
VC_VERSION: 14
13-
BUILD_TYPE: "nts-Win32"
14-
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
15-
16-
- PHP_VERSION: 7.1
17-
VC_VERSION: 14
18-
BUILD_TYPE: "Win32"
19-
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
20-
21-
- PHP_VERSION: 7.1
22-
VC_VERSION: 14
23-
BUILD_TYPE: "nts-Win32"
24-
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
25-
26-
- PHP_VERSION: 7.2
27-
VC_VERSION: 15
28-
BUILD_TYPE: "Win32"
29-
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
30-
31-
- PHP_VERSION: 7.2
32-
VC_VERSION: 15
33-
BUILD_TYPE: "nts-Win32"
34-
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
35-
36-
- PHP_VERSION: 7.3
37-
VC_VERSION: 15
38-
BUILD_TYPE: Win32
39-
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
40-
41-
- PHP_VERSION: 7.3
42-
VC_VERSION: 15
43-
BUILD_TYPE: nts-Win32
44-
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
45-
46-
- PHP_VERSION: 7.4
47-
VC_VERSION: 15
48-
BUILD_TYPE: Win32
49-
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
50-
51-
- PHP_VERSION: 7.4
52-
VC_VERSION: 15
53-
BUILD_TYPE: nts-Win32
54-
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
6+
# - PHP_VERSION: 7.0
7+
# VC_VERSION: 14
8+
# BUILD_TYPE: "Win32"
9+
# APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
10+
11+
# - PHP_VERSION: 7.0
12+
# VC_VERSION: 14
13+
# BUILD_TYPE: "nts-Win32"
14+
# APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
15+
16+
# - PHP_VERSION: 7.1
17+
# VC_VERSION: 14
18+
# BUILD_TYPE: "Win32"
19+
# APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
20+
21+
# - PHP_VERSION: 7.1
22+
# VC_VERSION: 14
23+
# BUILD_TYPE: "nts-Win32"
24+
# APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
25+
26+
# - PHP_VERSION: 7.2
27+
# VC_VERSION: 15
28+
# BUILD_TYPE: "Win32"
29+
# APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
30+
31+
# - PHP_VERSION: 7.2
32+
# VC_VERSION: 15
33+
# BUILD_TYPE: "nts-Win32"
34+
# APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
35+
36+
# - PHP_VERSION: 7.3
37+
# VC_VERSION: 15
38+
# BUILD_TYPE: Win32
39+
# APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
40+
41+
# - PHP_VERSION: 7.3
42+
# VC_VERSION: 15
43+
# BUILD_TYPE: nts-Win32
44+
# APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
45+
46+
# - PHP_VERSION: 7.4
47+
# VC_VERSION: 15
48+
# BUILD_TYPE: Win32
49+
# APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
50+
51+
# - PHP_VERSION: 7.4
52+
# VC_VERSION: 15
53+
# BUILD_TYPE: nts-Win32
54+
# APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
5555

5656
- PHP_VERSION: 8.0
57-
VC_VERSION: 15
57+
VC_VERSION: 16
5858
BUILD_TYPE: Win32
59-
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
59+
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
6060

61-
- PHP_VERSION: 8.0
62-
VC_VERSION: 15
63-
BUILD_TYPE: nts-Win32
64-
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
61+
# - PHP_VERSION: 8.0
62+
# VC_VERSION: 16
63+
# BUILD_TYPE: nts-Win32
64+
# APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
6565

6666
PHP_SDK_VERSION: 2.1.9
6767
# PHP_AVM: https://raw.githubusercontent.com/sergeyklay/php-appveyor/master/php-appveyor.psm1
@@ -107,7 +107,7 @@ install:
107107
build_script:
108108
- ps: InitializeBuildVars
109109
- '"%VSCOMNTOOLS%\VsDevCmd" %PLATFORM%'
110-
- '"%VSCOMNTOOLS%\..\..\VC\vcvarsall.bat" %ARCH%'
110+
- IF EXIST '"%VSCOMNTOOLS%\..\..\VC\vcvarsall.bat" %ARCH%' '"%VSCOMNTOOLS%\..\..\VC\vcvarsall.bat" %ARCH%'
111111
- phpsdk_setvars
112112
- cmd /c .ci\build-win32.bat
113113
- phpize

.ci/AppVeyor.psm1

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,16 @@ Function InitializeBuildVars {
2121
$Env:VSCOMNTOOLS = $Env:VS140COMNTOOLS
2222
break
2323
}
24+
'16' {
25+
# By default VS does not set the VS150COMNTOOLS as system-wide variable starting from VS2017
26+
# So, we need to use built-in tool from VS installer to set all the required vars manually
27+
$VSInstaller = "C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe"
28+
If (-not (Test-Path $VSInstaller)) {
29+
Throw 'The VSCOMNTOOLS environment variable is not set. Check your MS VS installation'
30+
}
31+
$Env:VSCOMNTOOLS = (& "${VsInstaller}" -latest -products * -property installationPath)
32+
break
33+
}
2434
default {
2535
Throw 'This script is designed to run with MS VS 14/15. Check your MS VS installation'
2636
break

0 commit comments

Comments
 (0)