Skip to content

Commit cbad8f3

Browse files
authored
Merge branch 'develop' into dependabot/github_actions/dot-github/workflows/actions/download-artifact-4.1.7
2 parents 7ca8123 + d21ca79 commit cbad8f3

File tree

8 files changed

+161
-154
lines changed

8 files changed

+161
-154
lines changed

.github/workflows/test_and_build.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -172,8 +172,10 @@ jobs:
172172
deploy: #-----------------------------------------------------------------------
173173
name: Deploy Phar
174174
if: |
175-
github.repository_owner == 'EasyEngine' &&
176-
(github.ref == 'refs/heads/develop' || github.ref == 'refs/heads/master')
175+
github.repository_owner == 'EasyEngine' && (
176+
startsWith(github.ref, 'refs/tags/') ||
177+
github.ref == 'refs/heads/develop'
178+
)
177179
runs-on: ubuntu-latest
178180
needs: [build, test]
179181

@@ -193,8 +195,8 @@ jobs:
193195
if: ${{ contains(github.ref, 'develop') }}
194196
run: |
195197
echo 'FILENAME=easyengine-nightly.phar' > $GITHUB_ENV
196-
- name: Set file name for master branch
197-
if: ${{ contains(github.ref, 'master') }}
198+
- name: Set file name for tag
199+
if: ${{ contains(github.ref, 'refs/tags') }}
198200
run: |
199201
echo 'FILENAME=easyengine.phar' > $GITHUB_ENV
200202

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,4 @@ profiles_settings.xml
2020
Project_Default.xml
2121
.idea
2222
ee_release
23+
changelog.txt

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.7.2
1+
4.7.6

composer.json

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,16 @@
1919
"platform": {
2020
"php": "7.3"
2121
},
22-
"sort-packages": true
22+
"sort-packages": true,
23+
"allow-plugins": {
24+
"dealerdirect/phpcodesniffer-composer-installer": true
25+
}
2326
},
2427
"minimum-stability": "dev",
2528
"prefer-stable": true,
2629
"require": {
2730
"php": ">=7.0",
28-
"composer/composer": "2.2.23",
31+
"composer/composer": "2.2.24",
2932
"composer/semver": "3.2.4",
3033
"daverandom/libdns": "^2.0",
3134
"easyengine/admin-tools-command": "v1.1.0",
@@ -35,10 +38,10 @@
3538
"easyengine/log-command": "v1.1.0",
3639
"easyengine/mailhog-command": "v1.0.3",
3740
"easyengine/service-command": "v1.6.1",
38-
"easyengine/shell-command": "v1.1.1",
39-
"easyengine/site-command": "v3.3.0",
40-
"easyengine/site-type-php": "v1.8.0",
41-
"easyengine/site-type-wp": "v1.8.0",
41+
"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",
4245
"monolog/monolog": "1.24.0",
4346
"mustache/mustache": "2.14.1",
4447
"rmccue/requests": "1.8.0",

0 commit comments

Comments
 (0)