From 9cd4a2e4b4fea3c771fb4dd8e958064e09585fd3 Mon Sep 17 00:00:00 2001 From: kuloud Date: Mon, 23 Dec 2019 23:12:53 +0800 Subject: [PATCH] =?UTF-8?q?[release=201.1.1.9]=20=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8F=91=E5=B8=83=E7=AE=A1=E7=90=86=E6=96=B9?= =?UTF-8?q?=E5=BC=8F=201=E3=80=81=E7=A7=BB=E9=99=A4actions=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E8=A7=A6=E5=8F=91=E8=84=9A=E6=9C=AC=EF=BC=88=E5=8C=85?= =?UTF-8?q?=E5=8A=A8=E6=80=81=E5=8C=96=E7=AE=A1=E7=90=86=E9=9C=80=E6=B1=82?= =?UTF-8?q?=EF=BC=89=202=E3=80=81=E7=BB=9F=E4=B8=80=E5=8C=85=E5=91=BD?= =?UTF-8?q?=E5=90=8D=E6=96=B9=E5=BC=8F=EF=BC=8C=E4=B8=BB=E5=B9=B2=E7=89=88?= =?UTF-8?q?=E6=9C=AC+=E5=B0=8F=E7=89=88=E6=9C=AC=EF=BC=8C=E9=80=82?= =?UTF-8?q?=E9=85=8D=E6=8E=A8=E7=90=86=E5=BC=95=E6=93=8E=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=91=BD=E5=90=8D=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/android_ci.yml | 1 - .github/workflows/publish.yml | 31 ------------------- Android/global_config.gradle | 19 ++++++------ Android/gradle/release.gradle | 22 ++++--------- Android/third_party/mnn/build.gradle | 2 +- Android/third_party/ncnn/build.gradle | 2 +- Android/third_party/pytorch/build.gradle | 2 +- .../third_party/tensorflow-lite/build.gradle | 2 +- Android/version.gradle | 3 +- 9 files changed, 22 insertions(+), 62 deletions(-) delete mode 100644 .github/workflows/publish.yml diff --git a/.github/workflows/android_ci.yml b/.github/workflows/android_ci.yml index c82d161..a27be88 100644 --- 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 deleted file mode 100644 index ce311cf..0000000 --- a/.github/workflows/publish.yml +++ /dev/null @@ -1,31 +0,0 @@ -name: publish aoe - -on: - push: - branches: - - master - paths: - - 'Android/version.gradle' -env: - GPR_USER: ${{ secrets.GPR_USER }} - GPR_API_KEY: ${{ secrets.GPR_API_KEY }} - -jobs: - publish: - strategy: - matrix: - repo: [github, bintray] - runs-on: [ubuntu-latest] - env: - GPR_USER: ${{ secrets.GPR_USER }} - GPR_API_KEY: ${{ secrets.GPR_API_KEY }} - GPR_REPO: ${{ matrix.repo }} - steps: - - uses: actions/checkout@v1 - - name: Set up JDK 1.8 - uses: actions/setup-java@v1 - with: - java-version: 1.8 - - name: Publish AoE to Github registry - shell: bash - run: cd ./Android && . ./publish.sh ${{ matrix.repo }} diff --git a/Android/global_config.gradle b/Android/global_config.gradle index 1a0b626..8de1960 100644 --- a/Android/global_config.gradle +++ b/Android/global_config.gradle @@ -25,6 +25,7 @@ ext { aoe_target_sdk_version = 26 aoe_version_code = 3 + aoe_version_name = aoe_major_version + '.' + aoe_suffix_version kotlin_version = '1.3.61' @@ -32,18 +33,18 @@ ext { 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 index 47b2612..6449dbf 100644 --- 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 index c3ac768..25eb3e3 100644 --- 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 index 8afb34b..29c5f88 100644 --- 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 index 8e690bb..dc73b06 100644 --- 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 index 2559a7a..7b51c21 100644 --- 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 index 214cf72..126fa18 100644 --- 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 } \ No newline at end of file