diff options
| author | Fabian Guerra <fabian.guerra@mapbox.com> | 2018-05-17 11:47:31 -0400 |
|---|---|---|
| committer | Fabian Guerra <fabian.guerra@mapbox.com> | 2018-05-17 11:47:31 -0400 |
| commit | 30376f3ce1d17522d9e64901b1bbc52906ee5267 (patch) | |
| tree | 1f00d04a223a76a86e16ddebc77f56d2cff88b5b /circle.yml | |
| parent | 7d1e52a3255d4eecdcd37e4fb600eb76fa9333f8 (diff) | |
| parent | 146057adf90e85e3edc80446f02d20e5f6cab378 (diff) | |
| download | qtlocation-mapboxgl-upstream/fabian-merge-release-4.0.1-master.tar.gz | |
Merge branch 'release-boba' into masterupstream/fabian-merge-release-4.0.1-master
# Conflicts:
# mapbox-gl-js
# platform/android/CHANGELOG.md
# platform/android/MapboxGLAndroidSDK/gradle.properties
# platform/android/gradle/dependencies.gradle
# platform/darwin/src/MGLVectorTileSource.mm
# platform/darwin/src/MGLVectorTileSource_Private.h
# platform/ios/CHANGELOG.md
# src/mbgl/style/expression/compound_expression.cpp
Diffstat (limited to 'circle.yml')
| -rw-r--r-- | circle.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/circle.yml b/circle.yml index d2232e9106..ca9ceb6636 100644 --- a/circle.yml +++ b/circle.yml @@ -358,7 +358,7 @@ jobs: gcloud firebase test android run --type instrumentation \ --app platform/android/MapboxGLAndroidSDKTestApp/build/outputs/apk/debug/MapboxGLAndroidSDKTestApp-debug.apk \ --test platform/android/MapboxGLAndroidSDKTestApp/build/outputs/apk/androidTest/debug/MapboxGLAndroidSDKTestApp-debug-androidTest.apk \ - --device-ids sailfish --os-version-ids 26 --locales en --orientations portrait --timeout 20m + --device-ids sailfish --os-version-ids 26 --locales en --orientations portrait --timeout 20m - store_artifacts: path: platform/android/MapboxGLAndroidSDKTestApp/build/outputs/apk/debug destination: . |