Skip to content

Commit 23e0369

Browse files
committed
Merge branch 'develop-v4' for v4.0.0-rc.1
2 parents 9b03d97 + 4a54405 commit 23e0369

24 files changed

+825
-521
lines changed

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ script:
4141
- ./ci/test-commands.sh
4242

4343
after_script:
44-
- cat /opt/easyengine/install.log
45-
- cat /opt/easyengine/ee.log
44+
- cat /opt/easyengine/logs/install.log
45+
- cat /opt/easyengine/logs/ee.log
4646

4747
jobs:
4848
include:

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.0.0-beta.6
1+
4.0.0-rc.1

ci/test-env-install.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env bash
22
function setup_test_requirements() {
3-
readonly LOG_FILE="/opt/easyengine/install.log"
3+
readonly LOG_FILE="/opt/easyengine/logs/install.log"
44
# Adding software-properties-common for add-apt-repository.
55
apt-get install -y software-properties-common
66
# Adding ondrej/php repository for installing php, this works for all ubuntu flavours.

composer.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,16 @@
2727
"php": ">=7.0",
2828
"composer/composer": "^1.2.0",
2929
"composer/semver": "~1.0",
30-
"easyengine/admin-tools-command": "v1.0.0-beta.1",
31-
"easyengine/auth-command": "v1.0.0-beta.1",
32-
"easyengine/config-command": "v1.0.0-beta.1",
33-
"easyengine/cron-command": "v1.0.0-beta.3",
34-
"easyengine/mailhog-command": "v1.0.0-beta.1",
35-
"easyengine/site-command": "v2.1.0",
36-
"easyengine/site-type-wp": "v1.0.0-beta.2",
37-
"easyengine/site-type-php": "v1.0.0-beta.1",
38-
"easyengine/service-command": "v1.0.0-beta.1",
39-
"easyengine/shell-command" : "v1.0.0-beta.2",
30+
"easyengine/admin-tools-command": "v1.0.0-rc.1",
31+
"easyengine/auth-command": "v1.0.0-rc.1",
32+
"easyengine/config-command": "v1.0.0-rc.1",
33+
"easyengine/cron-command": "v1.0.0-rc.1",
34+
"easyengine/mailhog-command": "v1.0.0-rc.1",
35+
"easyengine/site-command": "v2.2.0",
36+
"easyengine/site-type-wp": "v1.0.0-rc.1",
37+
"easyengine/site-type-php": "v1.0.0-rc.1",
38+
"easyengine/service-command": "v1.0.0-rc.1",
39+
"easyengine/shell-command" : "v1.0.0-rc.1",
4040
"justinrainbow/json-schema": "~5.2.5",
4141
"monolog/monolog": "^1.23",
4242
"mustache/mustache": "~2.4",

0 commit comments

Comments
 (0)