From 7eba31d125e221e71883bb7af9cb21618749d5d6 Mon Sep 17 00:00:00 2001 From: zmiao Date: Fri, 8 Nov 2019 16:40:34 +0200 Subject: fix --- circle.yml | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/circle.yml b/circle.yml index 3c9e49c372..31a0b1f84c 100644 --- a/circle.yml +++ b/circle.yml @@ -248,7 +248,7 @@ commands: - run: name: GradleBuild commond: | - cd render-test/android && ./gradlew --parallel --max-workers=8 -Pmapbox.abis=armeabi-v7a assembleRelease + cd render-test/android && ./gradlew --parallel --max-workers=8 -Pmapbox.abis=armeabi-v7a assembleDebug - run: name: Run gcloud tests on Firebase no_output_timeout: 20m @@ -675,7 +675,7 @@ jobs: name: Build RenderTestRunner APK command: | cd render-test/android - ./gradlew --parallel --max-workers=8 -Pmapbox.abis=armeabi-v7a assembleDebug + ./gradlew --parallel --max-workers=8 -Pmapbox.abis=arm64-v8a app:assembleDebug app:assembleDebugAndroidTest - login-google-cloud-platform - run: name: Run render test runner on Firebase @@ -684,11 +684,15 @@ jobs: mkdir abc cp -r mapbox-gl-js/test/integration/query-tests/fill/default/ abc/ if [[ -n "${GCLOUD_SERVICE_ACCOUNT_JSON}" && -z "${SKIP_FIREBASE:-}" ]]; then - gcloud alpha firebase test android models list - gcloud alpha firebase test android run --app render-test/android/app/build/outputs/apk/debug/app-debug.apk \ - --device-ids flo --os-version-ids 21 --locales en \ - --other-files abc/default/expected.json=/sdcard/render-test/mapbox-gl-js/test/integration/query-tests/default/ \ - --other-files abc/default/style.json=/sdcard/render-test/mapbox-gl-js/test/integration/query-tests/default/ + 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 \ + --device-ids sailfish --os-version-ids 26 --locales en --orientations portrait --timeout 20m \ + --environment-variables coverage=true,coverageFile="/sdcard/coverage.ec",testResult="/sdcard/render-tests_index.html" --directories-to-pull /sdcard --results-dir mapbox-android-sdk-${CIRCLE_BUILD_NUM} + coverageFile=`gsutil ls gs://test-lab-186672a0qp5bq-ycr70axads3nc/mapbox-android-sdk-${CIRCLE_BUILD_NUM}/**/*.ec | tail -1` + testResult=`gsutil ls gs://test-lab-186672a0qp5bq-ycr70axads3nc/mapbox-android-sdk-${CIRCLE_BUILD_NUM}/**/*.html | tail -1` + gsutil cp $coverageFile $PWD/platform/android/MapboxGLAndroidSDK/build/jacoco | true fi - next-save next-sanity-checks: -- cgit v1.2.1