完善ci发布流程

Author: CodFrm

Diff for: .travis.yml

@@ -22,9 +22,6 @@ script:
   - npm run pack
   - cd build/cxmooc-tools && zip ../cxmooc-tools.zip -r ./ && cd ../../
 
-before_deploy:
-  - export BODY=$(git log --pretty=format:"%s" $TRAVIS_COMMIT_RANGE)
-
 deploy:
   - provider: releases
     api_key: $GITHUB_TOKEN
@@ -35,7 +32,7 @@ deploy:
       - build/*.zip
     skip_cleanup: true
     name: $TRAVIS_TAG
-    body: $BODY
+    body: $(git log --pretty=format:"%s" ${TRAVIS_TAG}..)
     on:
       tags: true
       branch: master
@@ -54,11 +51,18 @@ deploy:
     script: node src/tg-bot.js
     skip_cleanup: true
     on:
-      all_branches: true
-      condition: $TRAVIS_BRANCH =~ ^master|develop$
+      branch: develop
+      
+  - provider: script
+    script: node src/tg-bot.js
+    skip_cleanup: true
+    on:
+      tags: true
+      branch: master
 
   - provider: npm
     email: $NPM_EMAIL
     api_key: $NPM_KEY
     on:
       tags: true
+      branch: master

Diff for: src/tg-bot.js

@@ -6,17 +6,19 @@ const botToken = process.env.BOT_TOKEN || '';
 const chat_id = process.env.GROUP_ID || '';
 const commit_range = process.env.TRAVIS_COMMIT_RANGE || '';
 const branch = process.env.TRAVIS_BRANCH || 'develop';
+const tag = process.env.TRAVIS_TAG || false;
+
 const tgBot = new TelegramBot(botToken, { polling: false });
 
-exec('git log --pretty=format:"%s" ' + commit_range, (err, stdout, stderr) => {
+exec('git log --pretty=format:"%s" ' + (branch == 'master' && tag ? tag + '..' : commit_range), (err, stdout, stderr) => {
     let sendText = '';
     let end = '';
-    if (branch == 'master') {
+    if (branch == 'master' && tag) {
         sendText += "*有一个新版本发布*\n";
         end = '\n[前去release查看](https://github.com/CodFrm/cxmooc-tools/releases)';
     } else {
         sendText += "*有一个内测版本发布*\n";
-        end='如果发现有什么BUG,记得[反馈](https://github.com/CodFrm/cxmooc-tools/issues)哦';
+        end = '如果发现有什么BUG,记得[反馈](https://github.com/CodFrm/cxmooc-tools/issues)哦';
     }
     sendText += "更新了以下内容:\n```" + stdout + "```" + end;
     tgBot.sendMessage(chat_id, sendText, { parse_mode: 'Markdown' });