diff options
| author | Fabian Guerra <fabian.guerra@mapbox.com> | 2018-01-04 17:13:55 -0600 |
|---|---|---|
| committer | Fabian Guerra <fabian.guerra@mapbox.com> | 2018-01-04 17:13:55 -0600 |
| commit | 6fa57b7d48b6f0505166b8d3a940eaaf1ab5a18f (patch) | |
| tree | 14e8ea93393095746e208b23c2358d13658ae17a /circle.yml | |
| parent | 5bfa20d71dc099416c5d715e7857ae836db160ed (diff) | |
| parent | 187b6dc31cf281b5157de1acd92f3e8ef9d0acf9 (diff) | |
| download | qtlocation-mapboxgl-6fa57b7d48b6f0505166b8d3a940eaaf1ab5a18f.tar.gz | |
Merge branch 'release-agua' back to master.
Diffstat (limited to 'circle.yml')
| -rw-r--r-- | circle.yml | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/circle.yml b/circle.yml index 4a1c22c305..3378eb18ae 100644 --- a/circle.yml +++ b/circle.yml @@ -238,6 +238,7 @@ jobs: - run: name: Run Clang checks command: make check + no_output_timeout: 20m # ------------------------------------------------------------------------------ android-debug-arm-v7: @@ -257,6 +258,9 @@ jobs: - *restore-gradle-cache - *reset-ccache-stats - run: + name: Check code style + command: make android-check + - run: name: Build libmapbox-gl.so for arm-v7 command: make android-lib-arm-v7 - run: @@ -269,17 +273,6 @@ jobs: name: Generate Espresso sanity tests command: make test-code-android - run: - name: Check Java code style - command: make android-checkstyle - - run: - name: Check Android modules for potential bugs (Lint SDK) - command: | - make android-lint-sdk - - run: - name: Check Android modules for potential bugs (Lint Test App) - command: | - make android-lint-test-app - - run: name: Build Test APK command: | echo "${MAPBOX_DEVELOPER_CONFIG_XML}" > platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/developer-config.xml |