Skip to content

Commit 604e6c7

Browse files
authored
Merge pull request #260 from wp-cli/bump-travis-server-to-xenial
Bump Travis CI OS from `trusty` to `xenial`
2 parents df5d99c + 536e5d8 commit 604e6c7

File tree

3 files changed

+10
-6
lines changed

3 files changed

+10
-6
lines changed

.travis.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ dist: xenial
44
language: php
55
php: 7.4
66

7+
services:
8+
- mysql
9+
710
notifications:
811
email:
912
on_success: never
@@ -74,6 +77,7 @@ jobs:
7477
- stage: test
7578
php: 5.6
7679
env: WP_VERSION=3.7.11
80+
dist: trusty
7781
- stage: test
7882
php: 5.6
7983
env: WP_VERSION=trunk

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
],
1414
"require": {
1515
"php": "^5.4 || ^7.0",
16-
"wp-cli/wp-cli": "^2"
16+
"wp-cli/wp-cli": "dev-master"
1717
},
1818
"require-dev": {
1919
"wp-cli/extension-command": "^1.2 || ^2",

features/scaffold.feature

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ Feature: WordPress code scaffolding
335335
"""
336336
And the return code should be 1
337337
338-
@require-php-5.6
338+
@require-php-5.6 @require-wp-4.6
339339
Scenario: Scaffold starter code for a theme
340340
Given a WP install
341341
Given I run `wp theme path`
@@ -350,7 +350,7 @@ Feature: WordPress code scaffolding
350350
And the {THEME_DIR}/starter-theme/style.css file should exist
351351
And the {THEME_DIR}/starter-theme/.editorconfig file should exist
352352
353-
@require-php-5.6
353+
@require-php-5.6 @require-wp-4.6
354354
Scenario: Scaffold starter code for a theme with sass
355355
Given a WP install
356356
Given I run `wp theme path`
@@ -364,7 +364,7 @@ Feature: WordPress code scaffolding
364364
"""
365365
And the {THEME_DIR}/starter-theme/sass directory should exist
366366
367-
@require-php-5.6
367+
@require-php-5.6 @require-wp-4.6
368368
Scenario: Scaffold starter code for a WooCommerce theme
369369
Given a WP install
370370
Given I run `wp theme path`
@@ -379,7 +379,7 @@ Feature: WordPress code scaffolding
379379
And the {THEME_DIR}/starter-theme/woocommerce.css file should exist
380380
And the {THEME_DIR}/starter-theme/inc/woocommerce.php file should exist
381381
382-
@require-php-5.6
382+
@require-php-5.6 @require-wp-4.6
383383
Scenario: Scaffold starter code for a theme and activate it
384384
Given a WP install
385385
# Allow for warnings to be generated due to https://github.com/wp-cli/scaffold-command/issues/181
@@ -506,7 +506,7 @@ Feature: WordPress code scaffolding
506506
Success: Network enabled the 'Starter-theme' theme.
507507
"""
508508
509-
@require-php-5.6
509+
@require-php-5.6 @require-wp-4.6
510510
Scenario: Scaffold starter code for a theme, but can't unzip theme files
511511
Given a WP install
512512
And a misconfigured WP_CONTENT_DIR constant directory

0 commit comments

Comments
 (0)