Skip to content

Commit 666431d

Browse files
committed
Merge branch 'develop' for v4.6.1
2 parents 68e401d + b113551 commit 666431d

File tree

4 files changed

+107
-291
lines changed

4 files changed

+107
-291
lines changed

.github/workflows/test_and_build.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ jobs:
5454
fi
5555
5656
- name: Setup EE version
57+
if: ${{ ! startsWith(github.ref, 'refs/tags/') }}
5758
run: |
5859
cd "$GITHUB_WORKSPACE"
5960
if [[ "$GITHUB_REF" != $DEPLOY_BRANCH ]]; then
@@ -173,7 +174,7 @@ jobs:
173174
name: Deploy Phar
174175
if: |
175176
github.repository_owner == 'EasyEngine' &&
176-
(github.ref == 'refs/heads/develop' || github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/'))
177+
(github.ref == 'refs/heads/develop' || github.ref == 'refs/heads/master')
177178
runs-on: ubuntu-latest
178179
needs: [build, test]
179180

@@ -231,7 +232,7 @@ jobs:
231232
github.repository_owner == 'EasyEngine' &&
232233
startsWith(github.ref, 'refs/tags/')
233234
runs-on: ubuntu-latest
234-
needs: [build, test, deploy]
235+
needs: [build, test]
235236

236237
steps:
237238
- name: Check out source code

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.6.0
1+
4.6.1

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
"easyengine/mailhog-command": "v1.0.3",
3636
"easyengine/service-command": "v1.4.0",
3737
"easyengine/shell-command": "v1.1.1",
38-
"easyengine/site-command": "v3.2.0",
38+
"easyengine/site-command": "v3.2.1",
3939
"easyengine/site-type-php": "v1.7.0",
4040
"easyengine/site-type-wp": "v1.7.0",
4141
"monolog/monolog": "1.24.0",

0 commit comments

Comments
 (0)