#Changed#

git tag
Kyson · Jan 22, 2020 · 59826bf · 59826bf
1 parent 7fd5926
commit 59826bf
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -40,6 +40,7 @@ deploy:
       file: "./app/build/outputs/apk/release/app-release.apk"
       skip_cleanup: true
       on:
+        tags: true
         branch: master
 
 after_success:

diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
@@ -3,7 +3,8 @@
 ## Deploy
 
 1. update VERSION_NAME in gradle.properties(same as AndroidGodEye)
-2. PUSH master，查看编译状态：[AndroidGodEyeDemo-travis-ci](https://travis-ci.org/Kyson/AndroidGodEyeDemo)
+2. git tag VERSION_NAME
+3. push master，查看编译状态：[AndroidGodEyeDemo-travis-ci](https://travis-ci.org/Kyson/AndroidGodEyeDemo)
 
 ## Keystore
 

diff --git a/build.gradle b/build.gradle
@@ -25,11 +25,20 @@ task clean(type: Delete) {
     delete rootProject.buildDir
 }
 
-String[] versionPart = String.valueOf(VERSION_NAME).split('\\.')
+def realVersionName = VERSION_NAME
+def TRAVIS_TAG = System.getenv("TRAVIS_TAG")
+if (TRAVIS_TAG != null && "" != TRAVIS_TAG) {
+    realVersionName = TRAVIS_TAG
+    println "[VERSION] Version name is [" + realVersionName + "] by git tag."
+} else {
+    println "[VERSION] Version name is [" + realVersionName + "] by gradle.properties."
+}
+
+String[] versionPart = String.valueOf(realVersionName).split('\\.')
 int realVersionCode = Integer.valueOf(versionPart[0]) * 1000000 + Integer.valueOf(versionPart[1]) * 1000 + Integer.valueOf(versionPart[2])
 
 ext {
-    REAL_VERSION_NAME = VERSION_NAME
+    REAL_VERSION_NAME = realVersionName
     REAL_VERSION_CODE = realVersionCode
 }