Merge branch 'Tencent#53' into 'master'

Snapshot版本号从Orange-CI环境变量上取。 Snapshot版本号从Orange-CI环境变量上取。 fix Tencent#53 See merge request !68
shifujun · Apr 22, 2019 · b2e48de · b2e48de
2 parents 5f42019 + 9412782
commit b2e48de
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/.orange-ci.yml b/.orange-ci.yml
@@ -1,7 +1,6 @@
 '**':
   push:
     - network: idc-kvm
-      needGit: true
       docker:
         kvm: true
         image: dockerimage.isd.com/android-build/shadow-build-cache:latest

diff --git a/buildScripts/gradle/common.gradle b/buildScripts/gradle/common.gradle
@@ -15,6 +15,8 @@ allprojects {
     ext.VERSION_NAME = "2.0.12"
     if ("${System.env.PUBLISH_RELEASE}".equalsIgnoreCase("true")) {
         ext.VERSION_SUFFIX = ""
+    } else if ("${System.env.ORANGE}".equalsIgnoreCase("true")) {
+        ext.VERSION_SUFFIX = "-${System.env.ORANGE_COMMIT_SHORT}-SNAPSHOT"
     } else {
         ext.VERSION_SUFFIX = "-${gitShortRev()}-SNAPSHOT"
     }