File tree Expand file tree Collapse file tree 5 files changed +26
-37
lines changed Expand file tree Collapse file tree 5 files changed +26
-37
lines changed Original file line number Diff line number Diff 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
2525install :
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:
4747jobs :
4848 include :
4949 - stage : deploy
50- env : DEPLOY_BRANCH=master-v4
50+ env : DEPLOY_BRANCH=master
5151 after_success : ./ci/deploy.sh
5252
5353cache :
5656
5757branches :
5858 only :
59- - develop-v4
60- - master-v4
59+ - develop
60+ - master
6161
6262notifications :
6363 email :
Original file line number Diff line number Diff line change 1- 4.0.0-rc.2
1+ 4.0.0
Original file line number Diff line number Diff line change @@ -12,7 +12,7 @@ if [ -z $DEPLOY_BRANCH ]; then
1212 exit
1313fi
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
1818fi
@@ -36,7 +36,7 @@ git config user.name "Travis CI"
3636git config user.email
" [email protected] " 3737git config push.default " current"
3838
39- if [[ " $TRAVIS_BRANCH " == " develop-v4 " ]]; then
39+ if [[ " $TRAVIS_BRANCH " == " develop" ]]; then
4040 fname=" phar/easyengine-nightly.phar"
4141else
4242 fname=" phar/easyengine.phar"
@@ -52,4 +52,4 @@ sha512sum $fname | cut -d ' ' -f 1 > $fname.sha512
5252
5353git add .
5454git commit -m " phar build: $TRAVIS_REPO_SLUG @$TRAVIS_COMMIT "
55- git push
55+ git push
Original file line number Diff line number Diff line change 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" ,
You can’t perform that action at this time.
0 commit comments