[release 1.1.1.9] 更新版本发布管理方式

1、移除actions自动触发脚本（包动态化管理需求） 2、统一包命名方式，主干版本+小版本，适配推理引擎版本命名规则
didi · Dec 23, 2019 · 9cd4a2e · 9cd4a2e
1 parent 4882a6c
commit 9cd4a2e
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 62 deletions.
diff --git a/.github/workflows/android_ci.yml b/.github/workflows/android_ci.yml
@@ -6,7 +6,6 @@ on:
       - master
     paths:
       - 'Android/**'
-      - '!Android/version.gradle'
   schedule:
       - cron: "0 2 * * 1-5"
 

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
diff --git a/Android/global_config.gradle b/Android/global_config.gradle
@@ -25,25 +25,26 @@ ext {
     aoe_target_sdk_version = 26
 
     aoe_version_code = 3
+    aoe_version_name = aoe_major_version + '.' + aoe_suffix_version
 
     kotlin_version = '1.3.61'
 
     deps = [
             aoe    : [
                     // aoe 核心库统一版本管理
                     library   : [
-                            api                : isDebug() ? project(':library-api') : "com.didi.aoe:library-api:$aoe_version_name",
-                            logging            : isDebug() ? project(":library-logging") : "com.didi.aoe:library-logging:$aoe_version_name",
-                            core               : isDebug() ? project(':library-core') : "com.didi.aoe:library-core:$aoe_version_name",
-                            common             : isDebug() ? project(":library-common") : "com.didi.aoe:library-common:$aoe_version_name",
-                            service            : isDebug() ? project(':library-service') : "com.didi.aoe:library-service:$aoe_version_name",
+                            api    : isDebug() ? project(':library-api') : "com.didi.aoe:library-api:$aoe_version_name",
+                            logging: isDebug() ? project(":library-logging") : "com.didi.aoe:library-logging:$aoe_version_name",
+                            core   : isDebug() ? project(':library-core') : "com.didi.aoe:library-core:$aoe_version_name",
+                            common : isDebug() ? project(":library-common") : "com.didi.aoe:library-common:$aoe_version_name",
+                            service: isDebug() ? project(':library-service') : "com.didi.aoe:library-service:$aoe_version_name",
                     ],
                     // 第三方推理框架的适配，版本以对应框架版本命名同步，最后加一位小版本号，如TensorFlow 版本2.0.0，AoE 对应的适配版本为2.0.0.x
                     runtime   : [
-                            tensorflow: isDebug() ? project(':runtime-tensorflow-lite') : "com.didi.aoe:runtime-tensorflow-lite:2.0.0.1",
-                            pytorch   : isDebug() ? project(':runtime-pytorch') : "com.didi.aoe:runtime-pytorch:1.3.1.1",
-                            ncnn      : isDebug() ? project(':runtime-ncnn') : "com.didi.aoe:runtime-ncnn:20191113.1",
-                            mnn       : isDebug() ? project(':runtime-mnn') : "com.didi.aoe:runtime-mnn:0.2.1.5.1",
+                            tensorflow: isDebug() ? project(':runtime-tensorflow-lite') : "com.didi.aoe:runtime-tensorflow-lite:2.0.0.$aoe_suffix_version",
+                            pytorch   : isDebug() ? project(':runtime-pytorch') : "com.didi.aoe:runtime-pytorch:1.3.1.$aoe_suffix_version",
+                            ncnn      : isDebug() ? project(':runtime-ncnn') : "com.didi.aoe:runtime-ncnn:20191113.$aoe_suffix_version",
+                            mnn       : isDebug() ? project(':runtime-mnn') : "com.didi.aoe:runtime-mnn:0.2.1.5.$aoe_suffix_version",
                     ],
                     // 拓展插件的版本跟随 aoe 当前版本，不随框架同步更新
                     extensions: [

diff --git a/Android/gradle/release.gradle b/Android/gradle/release.gradle
@@ -15,24 +15,14 @@
  */
 
 
-// release 版本后，自动化发布到 Github & Bintray，内部 maven 本地发布。
+// https://maven.pkg.github.com/didi/AoE
+apply from: rootProject.file('gradle/release_github_package_registry.gradle')
 
-if ("github".equalsIgnoreCase(System.getenv("GPR_REPO"))) {
+// https://bintray.com/aoe/maven
+apply from: rootProject.file('gradle/release_bintray.gradle')
 
-    // https://maven.pkg.github.com/didi/AoE
-    apply from: rootProject.file('gradle/release_github_package_registry.gradle')
-
-} else if ("bintray".equalsIgnoreCase(System.getenv("GPR_REPO"))) {
-
-    // https://bintray.com/aoe/maven
-    apply from: rootProject.file('gradle/release_bintray.gradle')
-
-} else {
-
-    // didi
-    apply from: rootProject.file('gradle/release_didi.gradle')
-
-}
+// didi
+apply from: rootProject.file('gradle/release_didi.gradle')
 
 
 

diff --git a/Android/third_party/mnn/build.gradle b/Android/third_party/mnn/build.gradle
@@ -3,7 +3,7 @@ apply plugin: 'com.android.library'
 ext {
     releaseArtifact = 'runtime-mnn'
     releaseDescription = 'The AoE MNN runtime library'
-    releaseVersion = '0.2.1.5.1'
+    releaseVersion = '0.2.1.5.' + aoe_suffix_version
 }
 apply from: rootProject.file('gradle/release.gradle')
 

diff --git a/Android/third_party/ncnn/build.gradle b/Android/third_party/ncnn/build.gradle
@@ -4,7 +4,7 @@ apply plugin: 'kotlin-android'
 ext {
     releaseArtifact = 'runtime-ncnn'
     releaseDescription = 'The AoE NCNN runtime library'
-    releaseVersion = '20191113.1'
+    releaseVersion = '20191113.' + aoe_suffix_version
 }
 apply from: rootProject.file('gradle/release.gradle')
 

diff --git a/Android/third_party/pytorch/build.gradle b/Android/third_party/pytorch/build.gradle
@@ -20,7 +20,7 @@ apply plugin: 'kotlin-android'
 ext {
     releaseArtifact = 'runtime-pytorch'
     releaseDescription = 'The AoE PyTorch runtime library'
-    releaseVersion = '1.3.1.1'
+    releaseVersion = '1.3.1.' + aoe_suffix_version
 }
 apply from: rootProject.file('gradle/release.gradle')
 

diff --git a/Android/third_party/tensorflow-lite/build.gradle b/Android/third_party/tensorflow-lite/build.gradle
@@ -5,7 +5,7 @@ apply plugin: 'kotlin-android'
 ext {
     releaseArtifact = 'runtime-tensorflow-lite'
     releaseDescription = 'The AoE tensorflow lite runtime library'
-    releaseVersion = '2.0.0.1'
+    releaseVersion = '2.0.0.' + aoe_suffix_version
 }
 apply from: rootProject.file('gradle/release.gradle')
 

diff --git a/Android/version.gradle b/Android/version.gradle
@@ -16,5 +16,6 @@
 
 
 ext {
-    aoe_version_name = '1.1.1.7'
+    aoe_major_version = '1.1.1'
+    aoe_suffix_version = 9
 }