Merge pull request #2 from yanqiong/dev

test pr pr1111

.travis.yml

@@ -3,40 +3,54 @@ dist: trusty
 sudo: true
 language: node_js
 node_js: '10'
-cache:
-  directories:
-  - node_modules
-  - "$HOME/.cache/"
+#cache:
+#  directories:
+#  - node_modules
+#  - "$HOME/.cache/"
 os:
   - osx
-addons:
-  apt:
-    packages:
-    - xvfb
-before_install:
-- npm update -g npm
-install:
-- export DISPLAY=':99.0'
-- Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &
-- npm install
+#addons:
+#  apt:
+#    packages:
+#    - xvfb
+#before_install:
+#- npm update -g npm
+#install:
+#- export DISPLAY=':99.0'
+#- Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &
+#- npm install
 script:
-  - 'if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then bash ./run_test.sh; fi'
-  - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then bash ./run_build.sh; fi'
+  - npm run test
+#  - 'if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then bash ./run_test.sh; fi'
+#  - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then bash ./run_build.sh; fi'
 branches:
   only:
   - master
 before_deploy:
   # Set up git user name and tag this commit
   - git config --local user.name "ElizabethMa"
   - git config --local user.email "[email protected]"
-  - export TRAVIS_TAG=${TRAVIS_TAG:-$(date +'%Y%m%d%H%M%S')-$(git log --format=%h -1)}
+  - export TRAVIS_TAG=${TRAVIS_TAG:-$(date +'%Y%m%d %H:%M:%S')-from brance $(TRAVIS_PULL_REQUEST_BRANCH)}
   - git tag $TRAVIS_TAG
 deploy:
-  provider: releases
-  api_key:
-    secure: lPa90tn/Tl9wUjmmnB5XWpicKyiPKMUmqcx1Y3yFF7Ip2gRcUjAhFZFF2jeuC53pqfM2ggDVL/3+dJ7V0WOpynxKGI/m4MjbfxQmEkUCfSQCPJKMP20a7KrKNAgIwv1vDn32EROS/NpbkTTwDz7D8C4a5V6f3D9TTa5mrnNXsFnmxnhx9alhUSLVW7mzQMBa9ma5tRipUEkbgw6wqGWTvs25QpL03xHAPhWC3kK5i1BWTUDC/LTWh2/5S4Tb1qFACx7cHWRDrf21WZhn9YW7iop3AqnekHjbC4IkAJk3/RJntQCdLwDVxUUhMCn6ARWgA0pPqLEVp+OwFsAG8GiuuwjmJISbaVuPhgmbbRXmPcG8X2adjZ1e6OyX1QyC/2A7bZSXC0PYSa/4HmQHj8bpkcHMqfVujUXWOxQGvtca2dtQYNE6xUxdRN3FUoQsHu6ekRbJLmYnh7rcc9e7CrS3ue9fcLaZbtRlkRxdOcH/FnynkpOZFKnkuM+Y5Zb8/GETlN4T5b2ManpQoCtFm52d0OnIbTKxc9wpio6LpJIRt9WAvkFBFOjBq+UG0xQ91k0FYO0Uza7Bhh6CkxFAeAvrECIie1JIeIw/NGEgSRdVYNkTNo7TaLBQgazhZHMzmwjNVrKEp+se6aqPR9C8iPNVQulNezj9PafdybAwUKv2NZ8=
-  file_glob: true
-  file: dist_electron/*.dmg
-  skip_cleanup: true
-  on:
-    repo: yanqiong/tianqin
+  - provider: releases
+    api_key:
+      secure: lPa90tn/Tl9wUjmmnB5XWpicKyiPKMUmqcx1Y3yFF7Ip2gRcUjAhFZFF2jeuC53pqfM2ggDVL/3+dJ7V0WOpynxKGI/m4MjbfxQmEkUCfSQCPJKMP20a7KrKNAgIwv1vDn32EROS/NpbkTTwDz7D8C4a5V6f3D9TTa5mrnNXsFnmxnhx9alhUSLVW7mzQMBa9ma5tRipUEkbgw6wqGWTvs25QpL03xHAPhWC3kK5i1BWTUDC/LTWh2/5S4Tb1qFACx7cHWRDrf21WZhn9YW7iop3AqnekHjbC4IkAJk3/RJntQCdLwDVxUUhMCn6ARWgA0pPqLEVp+OwFsAG8GiuuwjmJISbaVuPhgmbbRXmPcG8X2adjZ1e6OyX1QyC/2A7bZSXC0PYSa/4HmQHj8bpkcHMqfVujUXWOxQGvtca2dtQYNE6xUxdRN3FUoQsHu6ekRbJLmYnh7rcc9e7CrS3ue9fcLaZbtRlkRxdOcH/FnynkpOZFKnkuM+Y5Zb8/GETlN4T5b2ManpQoCtFm52d0OnIbTKxc9wpio6LpJIRt9WAvkFBFOjBq+UG0xQ91k0FYO0Uza7Bhh6CkxFAeAvrECIie1JIeIw/NGEgSRdVYNkTNo7TaLBQgazhZHMzmwjNVrKEp+se6aqPR9C8iPNVQulNezj9PafdybAwUKv2NZ8=
+    file_glob: true
+    file: dist_electron/*.dmg
+    skip_cleanup: true
+    on:
+      tags: true
+      branch: master
+      repo: yanqiong/tianqin
+
+  - provider: releases
+    api_key:
+      secure: lPa90tn/Tl9wUjmmnB5XWpicKyiPKMUmqcx1Y3yFF7Ip2gRcUjAhFZFF2jeuC53pqfM2ggDVL/3+dJ7V0WOpynxKGI/m4MjbfxQmEkUCfSQCPJKMP20a7KrKNAgIwv1vDn32EROS/NpbkTTwDz7D8C4a5V6f3D9TTa5mrnNXsFnmxnhx9alhUSLVW7mzQMBa9ma5tRipUEkbgw6wqGWTvs25QpL03xHAPhWC3kK5i1BWTUDC/LTWh2/5S4Tb1qFACx7cHWRDrf21WZhn9YW7iop3AqnekHjbC4IkAJk3/RJntQCdLwDVxUUhMCn6ARWgA0pPqLEVp+OwFsAG8GiuuwjmJISbaVuPhgmbbRXmPcG8X2adjZ1e6OyX1QyC/2A7bZSXC0PYSa/4HmQHj8bpkcHMqfVujUXWOxQGvtca2dtQYNE6xUxdRN3FUoQsHu6ekRbJLmYnh7rcc9e7CrS3ue9fcLaZbtRlkRxdOcH/FnynkpOZFKnkuM+Y5Zb8/GETlN4T5b2ManpQoCtFm52d0OnIbTKxc9wpio6LpJIRt9WAvkFBFOjBq+UG0xQ91k0FYO0Uza7Bhh6CkxFAeAvrECIie1JIeIw/NGEgSRdVYNkTNo7TaLBQgazhZHMzmwjNVrKEp+se6aqPR9C8iPNVQulNezj9PafdybAwUKv2NZ8=
+    file_glob: true
+    file: dist_electron/*.dmg
+    skip_cleanup: true
+    draft: true
+    on:
+      branch: dev
+      repo: yanqiong/tianqin

README.md

@@ -5,9 +5,21 @@
 打包的文件能不能打开用
 
 怎么命名的
+
 release Pre-release draft 差别 0.0.1,可以覆盖吗，怎么只留一个草稿，release在大版本更新的时候更新
+
+draft 只有一个吗   
+
+overwirte
+
+怎么区分不同的 release
+
 release / tag  msg 怎么设置
 
+git tag -a v1.4 -m 'my version 1.4'
+
+release 怎么读取到version 版本设置为 v{version}
+
 
 ### 开发流程
 yanqiong/tianqin/bugfix_xxx develop
@@ -20,9 +32,14 @@ git checkout -b bugfix_xxx(from master)
 
 git push yanqiong bugfix_xxx
 
-pull request (yanqiong/tinaqin/bugfix_xxx => shinnytech/tianqin/master)
+pull request (yanqiong/tinaqin/bugfix_xxx => shinnytech/tianqin/master)  // build draft
+
+yangyang review & merged => CI build // build release
+
+merged 的时候填信息  根据填写的信息区分 draft 和 release
+还是根据不同分分支区分 draft 和 release
+
 
-yangyang review & merged => CI build
 
 
 

package.json

@@ -12,7 +12,8 @@
     "postinstall": "electron-builder install-app-deps",
     "postuninstall": "electron-builder install-app-deps",
     "test:e2e": "vue-cli-service test:e2e",
-    "test:unit": "vue-cli-service test:unit"
+    "test:unit": "vue-cli-service test:unit",
+    "test": "node -v && npm -v"
   },
   "main": "background.js",
   "dependencies": {

run_build.sh

@@ -1,3 +1,2 @@
 #!/bin/bash
-npm run lint
-npm run electron:build
+echo 'test......'