Skip to content

PHPC-1504: Add PHP 7.4 to AppVeyor build matrix #1068

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Dec 4, 2019
Merged

PHPC-1504: Add PHP 7.4 to AppVeyor build matrix #1068

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
61190aa
PHPC-1504: Add PHP 7.4 to AppVeyor build matrix
jmikola Dec 4, 2019
22979be
Test each combination of x64/x86 and ZTS for PHP 7.1
jmikola Dec 4, 2019
63a48d5
Fix config.w32 for PHP 7.4.0
cmb69 Dec 4, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 24 additions & 4 deletions .appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,26 +13,36 @@ environment:
SDK_BRANCH: php-sdk-2.1.1

matrix:
- PHP_REL: 7.3
- PHP_REL: 7.4
ARCHITECTURE: x64
ZTS_STATE: enable
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
PHP_BUILD_CRT: vc15
- PHP_REL: 7.3
- PHP_REL: 7.4
ARCHITECTURE: x64
ZTS_STATE: disable
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
PHP_BUILD_CRT: vc15
- PHP_REL: 7.3
- PHP_REL: 7.4
ARCHITECTURE: x86
ZTS_STATE: enable
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
PHP_BUILD_CRT: vc15
- PHP_REL: 7.3
- PHP_REL: 7.4
ARCHITECTURE: x86
ZTS_STATE: disable
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
PHP_BUILD_CRT: vc15
- PHP_REL: 7.3
ARCHITECTURE: x64
ZTS_STATE: enable
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
PHP_BUILD_CRT: vc15
- PHP_REL: 7.3
ARCHITECTURE: x64
ZTS_STATE: disable
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
PHP_BUILD_CRT: vc15
- PHP_REL: 7.2
ARCHITECTURE: x64
ZTS_STATE: enable
Expand All @@ -48,6 +58,16 @@ environment:
ZTS_STATE: enable
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
PHP_BUILD_CRT: vc14
- PHP_REL: 7.1
ARCHITECTURE: x64
ZTS_STATE: disable
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
PHP_BUILD_CRT: vc14
- PHP_REL: 7.1
ARCHITECTURE: x86
ZTS_STATE: enable
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
PHP_BUILD_CRT: vc14
- PHP_REL: 7.1
ARCHITECTURE: x86
ZTS_STATE: disable
Expand Down
4 changes: 3 additions & 1 deletion config.w32
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,8 +245,10 @@ if (PHP_MONGODB != "no") {

if (typeof COMPILER_NAME === 'string') {
mongoc_opts.MONGOC_CC = COMPILER_NAME;
} else if (typeof VC_VERSIONS[VCVERS] === 'string') {
} else if (typeof VC_VERSIONS === 'array' && typeof VC_VERSIONS[VCVERS] === 'string') {
mongoc_opts.MONGOC_CC = VC_VERSIONS[VCVERS];
} else if (typeof COMPILER_NAME_LONG === 'string') {
mongoc_opts.MONGOC_CC = COMPILER_NAME_LONG;
}

/* MONGOC_USER_SET_CFLAGS and MONGOC_USER_SET_LDFLAGS can be left blank, as we
Expand Down