Skip to content

Commit c65fda8

Browse files
committed
Merge branch 'develop' for v4.0.10
2 parents 7444861 + 281a246 commit c65fda8

File tree

5 files changed

+127
-59
lines changed

5 files changed

+127
-59
lines changed

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.0.9
1+
4.0.10

composer.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,16 @@
2727
"php": ">=7.0",
2828
"composer/composer": "1.7.3",
2929
"composer/semver": "1.4.2",
30-
"easyengine/admin-tools-command": "v1.0.5",
30+
"easyengine/admin-tools-command": "v1.0.6",
3131
"easyengine/auth-command": "v1.0.2",
3232
"easyengine/config-command": "v1.0.2",
3333
"easyengine/cron-command": "v1.0.2",
3434
"easyengine/log-command": "v1.0.1",
3535
"easyengine/mailhog-command": "v1.0.2",
36-
"easyengine/site-command": "v2.2.10",
37-
"easyengine/site-type-wp": "v1.0.7",
38-
"easyengine/site-type-php": "v1.0.7",
39-
"easyengine/service-command": "v1.0.7",
36+
"easyengine/site-command": "v2.3.0",
37+
"easyengine/site-type-wp": "v1.0.8",
38+
"easyengine/site-type-php": "v1.0.8",
39+
"easyengine/service-command": "v1.0.8",
4040
"easyengine/shell-command" : "v1.0.2",
4141
"justinrainbow/json-schema": "5.2.7",
4242
"monolog/monolog": "1.24.0",

composer.lock

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

php/commands/src/CLI_Command.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -269,6 +269,7 @@ public function update( $_, $assoc_args ) {
269269
} elseif ( ! is_writable( dirname( $old_phar ) ) ) {
270270
EE::error( sprintf( '%s is not writable by current user.', dirname( $old_phar ) ) );
271271
}
272+
EE::log( "Note: It is recommended to run EasyEngine update in tmux/screen. Update at times may take some time.\nTo view progress, tail logs in a different window using `tail -f /opt/easyengine/logs/ee.log`." );
272273
if ( Utils\get_flag_value( $assoc_args, 'nightly' ) ) {
273274
EE::confirm( sprintf( 'You have version %s. Would you like to update to the latest nightly?', EE_VERSION ), $assoc_args );
274275
$download_url = 'https://raw.githubusercontent.com/EasyEngine/easyengine-builds/master/phar/easyengine-nightly.phar';

0 commit comments

Comments
 (0)