Skip to content

Commit 26278f1

Browse files
desrosjdesrosj
committed
Build/Test Tools: Revert [49358] to investigate failures.
Unprops desrosj. See #50042. git-svn-id: https://develop.svn.wordpress.org/trunk@49360 602fd350-edb4-49c9-b593-d223f7449a82
1 parent ebf85d6 commit 26278f1

7 files changed

Lines changed: 18 additions & 52 deletions

File tree

‎.env‎

Lines changed: 2 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,6 @@
33
#
44
# All of these options can be overridden by setting them as environment variables before starting
55
# the environment. You will need to restart your environment when changing any of these.
6-
#
7-
# Below, the following substitutions can be made:
8-
# - '{version}': any major.minor PHP version from 5.2 onwards.
9-
# - '{phpunit_version}': any major PHPUnit version starting with 4.
106
##
117

128
# The site will be available at http://localhost:LOCAL_PORT
@@ -15,30 +11,10 @@ LOCAL_PORT=8889
1511
# Where to run WordPress from. Valid options are 'src' and 'build'.
1612
LOCAL_DIR=src
1713

18-
# The PHP version to use. Valid options are 'latest', and '{version}-fpm'.
14+
# The PHP version to use. Valid options are 'latest', and '{version}-fpm', where '{version}' is any
15+
# x.y PHP version from 5.2 onwards.
1916
LOCAL_PHP=latest
2017

21-
##
22-
# The PHPUnit version to use when running tests.
23-
#
24-
# Support for new PHPUnit versions is not backported to past versions, so some old WordPress branches require an older
25-
# version to run tests.
26-
#
27-
# Valid versions are:
28-
# - 'latest' for the highest version of PHPUnit supported on the highest version of PHP supported.
29-
# - '{version}-fpm' for the highest version of PHPUnit supported on the specified version of PHP.
30-
# - '{phpunit_version}-php-{version}-fpm' for a specific version of PHPUnit on the specified version of PHP. This format
31-
# is only available for PHP versions 5.6 and higher.
32-
#
33-
# For the full list of available options, see https://hub.docker.com/r/wordpressdevelop/phpunit/tags.
34-
#
35-
# For full documentation on PHPUnit compatibility and WordPress versions, see
36-
# https://make.wordpress.org/core/handbook/references/phpunit-compatibility-and-wordpress-versions/.
37-
#
38-
# This defaults to the value assigned to the value of LOCAL_PHP.
39-
##
40-
LOCAL_PHPUNIT=${LOCAL_PHP}
41-
4218
# Whether or not to enable XDebug.
4319
LOCAL_PHP_XDEBUG=false
4420

‎docker-compose.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ services:
9696
# The PHPUnit container.
9797
##
9898
phpunit:
99-
image: wordpressdevelop/phpunit:${LOCAL_PHPUNIT-latest}
99+
image: wordpressdevelop/phpunit:${LOCAL_PHP-latest}
100100

101101
networks:
102102
- wpdevnet

‎package-lock.json‎

Lines changed: 8 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
"check-node-version": "4.0.1",
3636
"copy-webpack-plugin": "^5.1.1",
3737
"cssnano": "4.1.10",
38-
"dotenv": "8.2.0",
38+
"dotenv": "8.1.0",
3939
"dotenv-expand": "5.1.0",
4040
"grunt": "~1.1.0",
4141
"grunt-banner": "^0.6.0",

‎tools/local-env/scripts/docker.js‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
const dotenv = require( 'dotenv' );
2-
const dotenvExpand = require( 'dotenv-expand' );
1+
const dotenv = require( 'dotenv' );
32
const { execSync } = require( 'child_process' );
4-
5-
dotenvExpand( dotenv.config() );
3+
dotenv.config();
64

75
// Execute any docker-compose command passed to this script.
86
execSync( 'docker-compose ' + process.argv.slice( 2 ).join( ' ' ), { stdio: 'inherit' } );

‎tools/local-env/scripts/install.js‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
const dotenv = require( 'dotenv' );
2-
const dotenvExpand = require( 'dotenv-expand' );
1+
const dotenv = require( 'dotenv' );
32
const wait_on = require( 'wait-on' );
43
const { execSync } = require( 'child_process' );
54
const { renameSync, readFileSync, writeFileSync } = require( 'fs' );
65

7-
dotenvExpand( dotenv.config() );
6+
dotenv.config();
87

98
// Create wp-config.php.
109
wp_cli( 'config create --dbname=wordpress_develop --dbuser=root --dbpass=password --dbhost=mysql --path=/var/www/src --force' );

‎tools/local-env/scripts/start.js‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
const dotenv = require( 'dotenv' );
2-
const dotenvExpand = require( 'dotenv-expand' );
1+
const dotenv = require( 'dotenv' );
32
const { execSync } = require( 'child_process' );
43

5-
dotenvExpand( dotenv.config() );
4+
dotenv.config();
65

76
// Start the local-env containers.
87
execSync( 'docker-compose up -d wordpress-develop', { stdio: 'inherit' } );

0 commit comments

Comments
 (0)