diff --git a/.travis.yml b/.travis.yml index 2a5c117595..5870cb8e9c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,16 +15,17 @@ before_script: # DEPLOY TO CHROME WEBSTORE script: - export KC3_VERSION=$(node -p -e "require('./package.json').version") -- if [ $TRAVIS_BRANCH == 'webstore' ]; then grunt build; fi +- if [ $TRAVIS_BRANCH == 'webstore' ] || [ $TRAVIS_BRANCH == 'release' ]; then grunt build; fi - if [ $TRAVIS_BRANCH == 'webstore' ] && [ $TRAVIS_PULL_REQUEST == "false" ]; then grunt webstore; fi +- if [ $TRAVIS_BRANCH == 'release' ] && [ $TRAVIS_PULL_REQUEST == "false" ]; then grunt package; fi # DEPLOY TO GITHUB RELEASES before_deploy: - git config --global user.email "builds@travis-ci.com" - git config --global user.name "Travis CI" - git tag $KC3_VERSION -a -m "Automated GitHub release for $KC3_VERSION" - - git push -q https://dragonjet:$GITHUB_API_KEY@github.com/KC3Kai/KC3Kai --tags - - mv build/release.zip build/kc3kai-$KC3_VERSION.zip + - git push -q https://sinsinpub:$GITHUB_API_KEY@github.com/sinsinpub/KC3Kai --tags + - cp build/release.zip build/kc3kai-$KC3_VERSION.zip deploy: provider: releases skip_cleanup: true @@ -33,14 +34,14 @@ deploy: - build/kc3kai-$KC3_VERSION.zip on: tags: false - branch: webstore + branch: release condition: $TRAVIS_PULL_REQUEST == "false" # BUILD NOTIFICATION FOR GITTER -notifications: - webhooks: - urls: - - https://webhooks.gitter.im/e/e8964a721dd35fd96e46 - on_success: change - on_failure: change - on_start: never +#notifications: +# webhooks: +# urls: +# - https://webhooks.gitter.im/e/e8964a721dd35fd96e46 +# on_success: change +# on_failure: change +# on_start: never diff --git a/Gruntfile.js b/Gruntfile.js index 9084d4d920..a301bff164 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -538,6 +538,10 @@ module.exports = function(grunt) { 'qunit' ]); + grunt.registerTask('package', [ + 'compress:release' + ]); + grunt.registerTask('webstore', [ 'compress:release', 'webstore_upload:kc3kai'