Skip to content

Commit 4127dd1

Browse files
committed
Merge branch 'develop' for v4.6.3
2 parents 76a1af7 + 203974d commit 4127dd1

File tree

5 files changed

+191
-414
lines changed

5 files changed

+191
-414
lines changed

.github/workflows/test_and_build.yml

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,27 @@ on:
1212
name: Build 🔨 + Test 👨‍🔧
1313

1414
jobs:
15-
1615
build: #---------------------------------------------------------------------
1716
name: Build Phar
1817
runs-on: ubuntu-latest
1918
steps:
2019
- name: Check out source code
21-
uses: actions/checkout@v2
20+
uses: actions/checkout@v3
21+
22+
- name: Set up PHP
23+
uses: shivammathur/setup-php@v2
24+
with:
25+
php-version: '7.4'
26+
coverage: none
27+
tools: composer
28+
extensions: pcntl, curl, sqlite3, zip, dom, mbstring, json
2229

2330
- name: Get Composer cache directory
2431
id: composer-cache
25-
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
32+
run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
2633

2734
- name: Set up Composer caching
28-
uses: actions/cache@v2
35+
uses: actions/cache@v3
2936
env:
3037
cache-name: cache-composer-dependencies
3138
with:
@@ -34,14 +41,6 @@ jobs:
3441
restore-keys: |
3542
${{ runner.os }}-composer-
3643
37-
- name: Set up PHP
38-
uses: shivammathur/setup-php@v2
39-
with:
40-
php-version: '7.4'
41-
coverage: none
42-
tools: composer
43-
extensions: pcntl, curl, sqlite3, zip, dom, mbstring, json
44-
4544
- name: Install dependencies
4645
run: |
4746
cd "$GITHUB_WORKSPACE"
@@ -69,7 +68,7 @@ jobs:
6968

7069

7170
- name: Upload EE version
72-
uses: actions/upload-artifact@v2
71+
uses: actions/upload-artifact@v3
7372
with:
7473
name: cli_version
7574
path: VERSION
@@ -81,7 +80,7 @@ jobs:
8180
run: sudo ./easyengine.phar cli info
8281

8382
- name: Upload built Phar file
84-
uses: actions/upload-artifact@v2
83+
uses: actions/upload-artifact@v3
8584
with:
8685
name: easyengine-phar
8786
path: easyengine.phar
@@ -96,14 +95,22 @@ jobs:
9695
php: ['7.2', '7.3', '7.4', '8.0', '8.1']
9796
steps:
9897
- name: Check out source code
99-
uses: actions/checkout@v2
98+
uses: actions/checkout@v3
99+
100+
- name: Set up PHP
101+
uses: shivammathur/setup-php@v2
102+
with:
103+
php-version: '${{ matrix.php }}'
104+
coverage: none
105+
tools: composer
106+
extensions: pcntl, curl, sqlite3, zip, dom, mbstring, json
100107

101108
- name: Get Composer cache directory
102109
id: composer-cache
103-
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
110+
run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
104111

105112
- name: Set up Composer caching
106-
uses: actions/cache@v2
113+
uses: actions/cache@v3
107114
env:
108115
cache-name: cache-composer-dependencies
109116
with:
@@ -112,14 +119,6 @@ jobs:
112119
restore-keys: |
113120
${{ runner.os }}-composer-
114121
115-
- name: Set up PHP
116-
uses: shivammathur/setup-php@v2
117-
with:
118-
php-version: '${{ matrix.php }}'
119-
coverage: none
120-
tools: composer
121-
extensions: pcntl, curl, sqlite3, zip, dom, mbstring, json
122-
123122
- name: Update docker
124123
run: |
125124
sudo apt purge nginx nginx-common docker docker-engine docker.io docker-ce containerd runc
@@ -180,13 +179,13 @@ jobs:
180179

181180
steps:
182181
- name: Check out builds repository
183-
uses: actions/checkout@v2
182+
uses: actions/checkout@v3
184183
with:
185184
repository: easyengine/easyengine-builds
186185
token: ${{ secrets.BOT_TOKEN }}
187186

188187
- name: Download built Phar file
189-
uses: actions/download-artifact@v2
188+
uses: actions/download-artifact@v3
190189
with:
191190
name: easyengine-phar
192191

@@ -236,14 +235,14 @@ jobs:
236235

237236
steps:
238237
- name: Check out source code
239-
uses: actions/checkout@v2
238+
uses: actions/checkout@v3
240239

241240
- name: Download built Phar file
242-
uses: actions/download-artifact@v2
241+
uses: actions/download-artifact@v3
243242
with:
244243
name: easyengine-phar
245244

246-
- name : Create hashes
245+
- name: Create hashes
247246
run: |
248247
md5sum easyengine.phar | cut -d ' ' -f 1 > easyengine.phar.md5
249248
sha512sum easyengine.phar | cut -d ' ' -f 1 > easyengine.phar.sha512
@@ -256,7 +255,7 @@ jobs:
256255

257256
- name: Get tag
258257
id: tag
259-
run: echo ::set-output name=tag::${GITHUB_REF/refs\/tags\//}
258+
run: echo tag=${GITHUB_REF/refs\/tags\//} >> $GITHUB_OUTPUT
260259

261260
- name: Release
262261
uses: softprops/action-gh-release@v1
@@ -266,5 +265,6 @@ jobs:
266265
easyengine.phar
267266
easyengine.phar.md5
268267
easyengine.phar.sha512
268+
draft: true
269269
name: EasyEngine ${{ steps.tag.outputs.tag }}
270270
token: ${{ secrets.GITHUB_TOKEN }}

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.6.2
1+
4.6.3

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"easyengine/shell-command": "v1.1.1",
3939
"easyengine/site-command": "v3.2.1",
4040
"easyengine/site-type-php": "v1.7.0",
41-
"easyengine/site-type-wp": "v1.7.0",
41+
"easyengine/site-type-wp": "v1.7.1",
4242
"monolog/monolog": "1.24.0",
4343
"mustache/mustache": "2.14.1",
4444
"rmccue/requests": "1.8.0",

0 commit comments

Comments
 (0)