summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThiago Marcos P. Santos <tmpsantos@gmail.com>2019-11-20 18:45:35 +0200
committerThiago Marcos P. Santos <tmpsantos@gmail.com>2019-11-21 15:31:59 +0200
commitd6eeea1909b7ddc7fa7d1880257a2deca86a1562 (patch)
tree3675fd2bdbd067f348ca678ac6899e4c2278bef3
parenta1243ac1eab6d46510063a853da77552529319c3 (diff)
downloadqtlocation-mapboxgl-d6eeea1909b7ddc7fa7d1880257a2deca86a1562.tar.gz
[build] Build Android release when running render tests
-rw-r--r--circle.yml6
-rw-r--r--render-test/android/app/build.gradle15
2 files changed, 15 insertions, 6 deletions
diff --git a/circle.yml b/circle.yml
index f3bf4dd1c2..89ff569244 100644
--- a/circle.yml
+++ b/circle.yml
@@ -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)
diff --git a/render-test/android/app/build.gradle b/render-test/android/app/build.gradle
index cb864128a2..b4d230381e 100644
--- a/render-test/android/app/build.gradle
+++ b/render-test/android/app/build.gradle
@@ -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 {