Skip to content

Commit 5347cc4

Browse files
committed
Merge branch 'develop' for v4.8.0
2 parents 2de40ba + d645c70 commit 5347cc4

File tree

5 files changed

+41
-40
lines changed

5 files changed

+41
-40
lines changed

.github/workflows/test_and_build.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- name: Set up PHP
2323
uses: shivammathur/setup-php@v2
2424
with:
25-
php-version: '7.4'
25+
php-version: '8.3'
2626
coverage: none
2727
tools: composer
2828
extensions: pcntl, curl, sqlite3, zip, dom, mbstring, json
@@ -68,7 +68,7 @@ jobs:
6868

6969

7070
- name: Upload EE version
71-
uses: actions/upload-artifact@v3
71+
uses: actions/upload-artifact@v4
7272
with:
7373
name: cli_version
7474
path: VERSION
@@ -80,7 +80,7 @@ jobs:
8080
run: sudo ./easyengine.phar cli info
8181

8282
- name: Upload built Phar file
83-
uses: actions/upload-artifact@v3
83+
uses: actions/upload-artifact@v4
8484
with:
8585
name: easyengine-phar
8686
path: easyengine.phar
@@ -92,7 +92,7 @@ jobs:
9292
strategy:
9393
fail-fast: false
9494
matrix:
95-
php: ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3']
95+
php: ['7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
9696
steps:
9797
- name: Check out source code
9898
uses: actions/checkout@v3
@@ -187,7 +187,7 @@ jobs:
187187
token: ${{ secrets.BOT_TOKEN }}
188188

189189
- name: Download built Phar file
190-
uses: actions/download-artifact@v3
190+
uses: actions/download-artifact@v4
191191
with:
192192
name: easyengine-phar
193193

@@ -240,7 +240,7 @@ jobs:
240240
uses: actions/checkout@v3
241241

242242
- name: Download built Phar file
243-
uses: actions/download-artifact@v3
243+
uses: actions/download-artifact@v4
244244
with:
245245
name: easyengine-phar
246246

VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.7.6
1+
4.8.0

composer.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@
3939
"easyengine/mailhog-command": "v1.0.3",
4040
"easyengine/service-command": "v1.6.1",
4141
"easyengine/shell-command": "v1.1.3",
42-
"easyengine/site-command": "v3.3.2",
43-
"easyengine/site-type-php": "v1.8.1",
44-
"easyengine/site-type-wp": "v1.8.2",
42+
"easyengine/site-command": "v3.3.3",
43+
"easyengine/site-type-php": "v1.9.0",
44+
"easyengine/site-type-wp": "v1.9.0",
4545
"monolog/monolog": "1.24.0",
4646
"mustache/mustache": "2.14.1",
4747
"rmccue/requests": "1.8.0",

composer.lock

+24-24
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

img-versions.json

+7-6
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,20 @@
22
"easyengine/cron": "v4.7.3",
33
"easyengine/mailhog": "v4.6.5",
44
"easyengine/mariadb": "v4.6.6",
5-
"easyengine/nginx-proxy": "v4.7.6",
5+
"easyengine/nginx-proxy": "v4.8.0",
66
"easyengine/nginx": "v4.7.6",
77
"easyengine/php": "v4.6.6",
88
"easyengine/php5.6": "v4.7.4",
99
"easyengine/php7.0": "v4.7.4",
1010
"easyengine/php7.2": "v4.7.4",
1111
"easyengine/php7.3": "v4.7.4",
1212
"easyengine/php7.4": "v4.7.4",
13-
"easyengine/php8.0": "v4.7.4",
14-
"easyengine/php8.1": "v4.7.5",
15-
"easyengine/php8.2": "v4.7.6",
16-
"easyengine/php8.3": "v4.7.6",
17-
"easyengine/postfix": "v4.7.4",
13+
"easyengine/php8.0": "v4.8.0",
14+
"easyengine/php8.1": "v4.8.0",
15+
"easyengine/php8.2": "v4.8.0",
16+
"easyengine/php8.3": "v4.8.0",
17+
"easyengine/php8.4": "v4.8.0",
18+
"easyengine/postfix": "v4.8.0",
1819
"easyengine/redis": "v4.7.6",
1920
"easyengine/newrelic-daemon": "v4.7.4"
2021
}

0 commit comments

Comments
 (0)