[build] Build Android release when running render tests

This commit is contained in:
Thiago Marcos P. Santos
2019-11-20 18:45:35 +02:00
parent a1243ac1ea
commit d6eeea1909
2 changed files with 15 additions and 6 deletions

View File

@@ -660,7 +660,7 @@ jobs:
name: Build RenderTestRunner APK
command: |
cd render-test/android
./gradlew --parallel --max-workers=8 -Pmapbox.abis=arm64-v8a app:assembleDebug app:assembleDebugAndroidTest
./gradlew --parallel --max-workers=8 -Pmapbox.abis=arm64-v8a app:assembleRelease app:assembleAndroidTest
- login-google-cloud-platform
- run:
name: Run RenderTestRunner Instrumentation Test on Firebase
@@ -669,8 +669,8 @@ jobs:
if [[ -n "${GCLOUD_SERVICE_ACCOUNT_JSON}" && -z "${SKIP_FIREBASE:-}" ]]; then
gcloud firebase test android models list
gcloud firebase test android run --type instrumentation \
--app render-test/android/app/build/outputs/apk/debug/app-debug.apk \
--test render-test/android/app/build/outputs/apk/androidTest/debug/app-debug-androidTest.apk \
--app render-test/android/app/build/outputs/apk/release/app-release.apk \
--test render-test/android/app/build/outputs/apk/androidTest/release/app-release-androidTest.apk \
--device-ids flame --os-version-ids 29 --locales en --orientations portrait --timeout 20m \
--directories-to-pull /sdcard --results-dir render-test-app-${CIRCLE_BUILD_NUM}
testResult=$(gsutil ls gs://test-lab-186672a0qp5bq-ycr70axads3nc/render-test-app-${CIRCLE_BUILD_NUM}/**/*.html | tail -1)

View File

@@ -9,13 +9,13 @@ android {
targetSdkVersion 28
def abi = 'all'
if (project.hasProperty('mapbox.abis')) {
abi = project.getProperty("mapbox.abis")
abi = project.getProperty('mapbox.abis')
}
ndk {
if (abi != 'all') {
abiFilters abi.split(' ')
} else {
abiFilters "armeabi-v7a", "x86", "arm64-v8a", "x86_64"
abiFilters 'armeabi-v7a', 'x86', 'arm64-v8a', 'x86_64'
}
}
externalNativeBuild {
@@ -25,7 +25,11 @@ android {
targets 'mbgl-render-test-runner'
}
}
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
android {
testBuildType 'release'
}
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
}
externalNativeBuild {
cmake {
@@ -33,6 +37,11 @@ android {
path '../../../next/CMakeLists.txt'
}
}
buildTypes {
release {
signingConfig signingConfigs.debug
}
}
}
dependencies {