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