#1175 move play listing to flavor sourceset, correct publishing task for enabled gradle play publisher and move to onSuccess
@ -54,16 +54,13 @@ script:
|
||||
# - adb shell input keyevent 82 & # unlock screen by pressing menu button
|
||||
# - adb -e logcat *:D > logcat.log &
|
||||
# - ./gradlew createKiwixDebugCoverageReport
|
||||
- if [ $TRAVIS_TAG ] && [$TRAVIS_PULL_REQUEST == “false” ] && [ $TRAVIS_BRANCH == “release” ]; then
|
||||
./gradlew publish;
|
||||
fi
|
||||
- if [ $TRAVIS_TAG ] && [$TRAVIS_PULL_REQUEST == “false” ] && [ $TRAVIS_BRANCH == “master” ]; then
|
||||
./gradlew publish;
|
||||
fi
|
||||
|
||||
after_success:
|
||||
- bash <(curl -s https://codecov.io/bash)
|
||||
- ./gradlew testdroidUploadKiwixDebug
|
||||
- if [ $TRAVIS_TAG ] && [$TRAVIS_PULL_REQUEST == “false” ] && [ $TRAVIS_BRANCH == “release” ] || [ $TRAVIS_BRANCH == “master” ]; then
|
||||
./gradlew publishKiwixRelease;
|
||||
fi
|
||||
|
||||
after_failure:
|
||||
- export LOG_DIR = ${TRAVIS_HOME}/build/kiwix/kiwix-android/app/build/outputs/reports/androidTests/connected/flavors/KIWIX/
|
||||
|
@ -180,7 +180,7 @@ def branchName = System.getenv('TRAVIS_PULL_REQUEST') ?: "false" == "false"
|
||||
: System.getenv('TRAVIS_PULL_REQUEST_BRANCH')
|
||||
def buildNumber = System.getenv('TRAVIS_BUILD_NUMBER') ?: "dev"
|
||||
|
||||
ext{
|
||||
ext {
|
||||
versionMajor = 2
|
||||
versionMinor = 5
|
||||
versionPatch = 0
|
||||
@ -306,6 +306,9 @@ android {
|
||||
map.each { name, directory ->
|
||||
"$name" {
|
||||
println "Configuring $name"
|
||||
if (name == "kiwix") {
|
||||
return
|
||||
}
|
||||
if (file(directory + "/build.gradle").exists()) {
|
||||
apply from: directory + "/build.gradle"
|
||||
}
|
||||
@ -434,7 +437,7 @@ android {
|
||||
}
|
||||
|
||||
play {
|
||||
enabled = branchName == "master"
|
||||
enabled = branchName == "master" || branchName == "release"
|
||||
serviceAccountCredentials = file("../google.json")
|
||||
track = "alpha"
|
||||
resolutionStrategy = "fail"
|
||||
|
Before Width: | Height: | Size: 253 KiB After Width: | Height: | Size: 253 KiB |
Before Width: | Height: | Size: 44 KiB After Width: | Height: | Size: 44 KiB |
Before Width: | Height: | Size: 522 KiB After Width: | Height: | Size: 522 KiB |
Before Width: | Height: | Size: 491 KiB After Width: | Height: | Size: 491 KiB |
Before Width: | Height: | Size: 68 KiB After Width: | Height: | Size: 68 KiB |
Before Width: | Height: | Size: 212 KiB After Width: | Height: | Size: 212 KiB |
Before Width: | Height: | Size: 185 KiB After Width: | Height: | Size: 185 KiB |
Before Width: | Height: | Size: 491 KiB After Width: | Height: | Size: 491 KiB |
Before Width: | Height: | Size: 66 KiB After Width: | Height: | Size: 66 KiB |
Before Width: | Height: | Size: 145 KiB After Width: | Height: | Size: 145 KiB |
Before Width: | Height: | Size: 58 KiB After Width: | Height: | Size: 58 KiB |
Before Width: | Height: | Size: 323 KiB After Width: | Height: | Size: 323 KiB |
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 11 KiB |
Before Width: | Height: | Size: 491 KiB After Width: | Height: | Size: 491 KiB |
Before Width: | Height: | Size: 522 KiB After Width: | Height: | Size: 522 KiB |
Before Width: | Height: | Size: 68 KiB After Width: | Height: | Size: 68 KiB |
Before Width: | Height: | Size: 379 KiB After Width: | Height: | Size: 379 KiB |
Before Width: | Height: | Size: 809 KiB After Width: | Height: | Size: 809 KiB |
Before Width: | Height: | Size: 76 KiB After Width: | Height: | Size: 76 KiB |
Before Width: | Height: | Size: 278 KiB After Width: | Height: | Size: 278 KiB |
Before Width: | Height: | Size: 502 KiB After Width: | Height: | Size: 502 KiB |
Before Width: | Height: | Size: 121 KiB After Width: | Height: | Size: 121 KiB |
Before Width: | Height: | Size: 670 KiB After Width: | Height: | Size: 670 KiB |