Skip to content

Commit 919813f

Browse files
authored
Merge branch 'develop' into fix_readme
2 parents 0832121 + 5d5f5aa commit 919813f

18 files changed

+2490
-650
lines changed

.github/ISSUE_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
This issue tracker is only for issues related to EasyEngine. Please use http://community.rtcamp.com/c/easyengine for support questions.
1+
This issue tracker is only for issues related to EasyEngine. Please use https://github.com/EasyEngine/easyengine/discussions for support questions.
22

33
If you feel the issue is a EasyEngine specific issue, please attach the output of the following commands.
44

.github/workflows/test_and_build.yml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
composer install --no-dev --no-progress --no-interaction
4949
else
5050
sed -i 's/\(easyengine\/.*\):\ \".*\"/\1:\ \"dev-develop\"/' composer.json
51-
composer update --prefer-dist --no-progress --no-interaction
51+
composer update --prefer-dist --no-dev --no-progress --no-interaction
5252
fi
5353
5454
- name: Setup EE version
@@ -90,7 +90,7 @@ jobs:
9090
strategy:
9191
fail-fast: false
9292
matrix:
93-
php: ['7.2', '7.3', '7.4', '8.0']
93+
php: ['7.2', '7.3', '7.4', '8.0', '8.1']
9494
steps:
9595
- name: Check out source code
9696
uses: actions/checkout@v2
@@ -125,11 +125,8 @@ jobs:
125125
126126
- name: Install docker-compose
127127
run: |
128-
VERSION=$(curl --silent "https://api.github.com/repos/docker/compose/releases/latest" |
129-
grep '"tag_name":' |
130-
sed -E 's/.*"([^"]+)".*/\1/'
131-
)
132-
sudo curl -L "https://github.com/docker/compose/releases/download/$VERSION/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
128+
sudo curl -L https://github.com/docker/compose/releases/download/1.29.2/docker-compose-$(uname -s)-$(uname -m) -o /usr/local/bin/docker-compose
129+
sudo chmod +x /usr/local/bin/docker-compose
133130
134131
- name: Install dependencies
135132
run: |

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,5 @@ vcs.xml
1818
workspace.xml
1919
profiles_settings.xml
2020
Project_Default.xml
21-
.idea
21+
.idea
22+
ee_release

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ EasyEngine makes it greatly easy to manage nginx, a fast web-server software tha
1818

1919
### Linux
2020

21-
For Linux, we have created an installer script that will install all the dependencies for you. We have tested this on Ubuntu 14.04, 16.04, 18.04 and Debian 8, Debian 10.
21+
For Linux, we have created an installer script that will install all the dependencies for you. We have tested this on Ubuntu 14.04, 16.04, 18.04, 20.04 and Debian 8, Debian 10.
2222

2323
```bash
2424
wget -qO ee https://rt.cx/ee4 && sudo bash ee

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.3.1
1+
4.5.5

composer.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,21 +25,21 @@
2525
"prefer-stable": true,
2626
"require": {
2727
"php": ">=7.0",
28-
"composer/composer": "2.1.9",
28+
"composer/composer": "2.2.12",
2929
"composer/semver": "3.2.4",
3030
"easyengine/admin-tools-command": "v1.1.0",
31-
"easyengine/auth-command": "v1.1.0",
31+
"easyengine/auth-command": "v1.2.0",
3232
"easyengine/config-command": "v1.0.2",
33-
"easyengine/cron-command": "v1.1.0",
33+
"easyengine/cron-command": "v1.2.0",
3434
"easyengine/log-command": "v1.1.0",
3535
"easyengine/mailhog-command": "v1.0.2",
36-
"easyengine/service-command": "v1.2.0",
36+
"easyengine/service-command": "v1.4.0",
3737
"easyengine/shell-command": "v1.1.0",
38-
"easyengine/site-command": "v2.8.2",
39-
"easyengine/site-type-php": "v1.5.0",
40-
"easyengine/site-type-wp": "v1.5.0",
38+
"easyengine/site-command": "v3.0.8",
39+
"easyengine/site-type-php": "v1.6.2",
40+
"easyengine/site-type-wp": "v1.6.7",
4141
"monolog/monolog": "1.24.0",
42-
"mustache/mustache": "2.13.0",
42+
"mustache/mustache": "2.14.1",
4343
"rmccue/requests": "1.8.0",
4444
"symfony/config": "4.4.*",
4545
"symfony/console": "4.4.*",
@@ -57,7 +57,7 @@
5757
"require-dev": {
5858
"behat/behat": "3.8.1",
5959
"dealerdirect/phpcodesniffer-composer-installer": "0.7.0",
60-
"phpunit/phpunit": "3.7.*",
60+
"phpunit/phpunit": "9.5.*",
6161
"phpcompatibility/php-compatibility": "8.2.0",
6262
"wp-coding-standards/wpcs": "0.13.1"
6363
},

0 commit comments

Comments
 (0)