Skip to content

Commit

Permalink
Merge pull request #3315 from teohhanhui/fix/appveyor-php74
Browse files Browse the repository at this point in the history
Fix AppVeyor build broken since PHP 7.4 release
  • Loading branch information
teohhanhui committed Dec 18, 2019
2 parents 16abcd9 + 0eca49c commit 91b12ff
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: 2.1

.constants:
- &ext-mongodb-version '1.6.0'
- &ext-mongodb-version '1.6.1'

commands:
clear-test-app-cache:
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ env:
COMPOSER_ALLOW_SUPERUSER: '1' # https://getcomposer.org/doc/03-cli.md#composer-allow-superuser
COMPOSER_INSTALLER_COMMIT: fb22b78362d31c0d2bf516d1f8cdfd2745caa431
COVERAGE: '0'
EXT_MONGODB_VERSION: '1.6.0'
EXT_MONGODB_VERSION: '1.6.1'
EXT_PCOV_VERSION: '1.0.6'
LEGACY: '0'

Expand All @@ -27,7 +27,7 @@ jobs:
- '7.1'
- '7.2'
- '7.3'
- '7.4-rc'
- '7.4'
include:
- php: '7.3'
coverage: true
Expand Down Expand Up @@ -161,7 +161,7 @@ jobs:
- '7.1'
- '7.2'
- '7.3'
- '7.4-rc'
- '7.4'
include:
- php: '7.3'
coverage: true
Expand Down Expand Up @@ -302,7 +302,7 @@ jobs:
matrix:
php:
- '7.3'
- '7.4-rc'
- '7.4'
fail-fast: false
timeout-minutes: 20
steps:
Expand Down Expand Up @@ -385,7 +385,7 @@ jobs:
matrix:
php:
- '7.3'
- '7.4-rc'
- '7.4'
fail-fast: false
timeout-minutes: 20
steps:
Expand Down
8 changes: 4 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,8 @@ jobs:
- *validate-openapi-v3-json
- *validate-openapi-v3-yaml

- name: '(PHP 7.4-rc)'
php: '7.4snapshot'
- name: '(PHP 7.4)'
php: '7.4'
env: LEGACY=0
before_install:
- *enable-mongodb-php-extension
Expand Down Expand Up @@ -121,8 +121,8 @@ jobs:
- *validate-openapi-v3-json
- *validate-openapi-v3-yaml

- name: '(PHP 7.4-rc) (lowest dependencies)'
php: '7.4snapshot'
- name: '(PHP 7.4) (lowest dependencies)'
php: '7.4'
env: LEGACY=0
before_install:
- *enable-mongodb-php-extension
Expand Down
4 changes: 2 additions & 2 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ install:
- ps: Set-Service wuauserv -StartupType Manual
- cinst -y php composer
- refreshenv
- cd c:\tools\php73\ext
- cd c:\tools\php74\ext
- ps: |
$web = New-Object Net.WebClient
$web.Headers.Add('user-agent', 'AppVeyor')
$web.DownloadFile('https://windows.php.net/downloads/pecl/releases/mongodb/1.5.3/php_mongodb-1.5.3-7.3-nts-vc15-x64.zip', 'c:\tools\php73\ext\php_mongodb.zip')
$web.DownloadFile('https://windows.php.net/downloads/pecl/releases/mongodb/1.6.1/php_mongodb-1.6.1-7.4-nts-vc15-x64.zip', 'c:\tools\php74\ext\php_mongodb.zip')
- 7z x php_mongodb.zip -y >nul
- cd ..
- copy php.ini-production php.ini /Y
Expand Down

0 comments on commit 91b12ff

Please sign in to comment.