Skip to content

Commit 1c16997

Browse files
Bump version to 4.0.0 🎉 🚀
1 parent 1d85e68 commit 1c16997

File tree

5 files changed

+26
-37
lines changed

5 files changed

+26
-37
lines changed

.travis.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@ before_install:
1818
fi
1919
- |
2020
# Update commands in composer.json to develop if branch is not master.
21-
if [[ "$TRAVIS_BRANCH" != "master-v4" ]]; then
21+
if [[ "$TRAVIS_BRANCH" != "master" ]]; then
2222
sed -i 's/\(easyengine\/.*\):\ \".*\"/\1:\ \"dev-develop\"/' composer.json
2323
fi
2424
2525
install:
2626
- |
2727
# Run composer install for master else update.
28-
if [[ "$TRAVIS_BRANCH" = "master-v4" ]]; then
28+
if [[ "$TRAVIS_BRANCH" = "master" ]]; then
2929
composer install --no-interaction
3030
else
3131
composer update
@@ -47,7 +47,7 @@ after_script:
4747
jobs:
4848
include:
4949
- stage: deploy
50-
env: DEPLOY_BRANCH=master-v4
50+
env: DEPLOY_BRANCH=master
5151
after_success: ./ci/deploy.sh
5252

5353
cache:
@@ -56,8 +56,8 @@ cache:
5656

5757
branches:
5858
only:
59-
- develop-v4
60-
- master-v4
59+
- develop
60+
- master
6161

6262
notifications:
6363
email:

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.0.0-rc.2
1+
4.0.0

ci/deploy.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ if [ -z $DEPLOY_BRANCH ]; then
1212
exit
1313
fi
1414

15-
if [[ "$TRAVIS_BRANCH" != "$DEPLOY_BRANCH" ]] && [[ ! "$TRAVIS_BRANCH" == "develop-v4" ]]; then
15+
if [[ "$TRAVIS_BRANCH" != "$DEPLOY_BRANCH" ]] && [[ ! "$TRAVIS_BRANCH" == "develop" ]]; then
1616
echo "Skipping deployment as '$TRAVIS_BRANCH' is not a deploy branch."
1717
exit
1818
fi
@@ -36,7 +36,7 @@ git config user.name "Travis CI"
3636
git config user.email "[email protected]"
3737
git config push.default "current"
3838

39-
if [[ "$TRAVIS_BRANCH" == "develop-v4" ]]; then
39+
if [[ "$TRAVIS_BRANCH" == "develop" ]]; then
4040
fname="phar/easyengine-nightly.phar"
4141
else
4242
fname="phar/easyengine.phar"
@@ -52,4 +52,4 @@ sha512sum $fname | cut -d ' ' -f 1 > $fname.sha512
5252

5353
git add .
5454
git commit -m "phar build: $TRAVIS_REPO_SLUG@$TRAVIS_COMMIT"
55-
git push
55+
git push

composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,14 @@
2929
"composer/semver": "~1.0",
3030
"easyengine/admin-tools-command": "v1.0.0",
3131
"easyengine/auth-command": "v1.0.0",
32-
"easyengine/config-command": "v1.0.0-rc.1",
33-
"easyengine/cron-command": "v1.0.0-rc.2",
32+
"easyengine/config-command": "v1.0.0",
33+
"easyengine/cron-command": "v1.0.0",
3434
"easyengine/mailhog-command": "v1.0.0",
3535
"easyengine/site-command": "v2.2.2",
3636
"easyengine/site-type-wp": "v1.0.0",
3737
"easyengine/site-type-php": "v1.0.0",
3838
"easyengine/service-command": "v1.0.0",
39-
"easyengine/shell-command" : "v1.0.0-rc.1",
39+
"easyengine/shell-command" : "v1.0.0",
4040
"justinrainbow/json-schema": "~5.2.5",
4141
"monolog/monolog": "^1.23",
4242
"mustache/mustache": "~2.4",

composer.lock

Lines changed: 14 additions & 25 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)