From 8237f095153f155ca03790258e6d6073a7bb59f0 Mon Sep 17 00:00:00 2001 From: Chuck Greb Date: Tue, 7 Feb 2017 15:34:18 -0500 Subject: [PATCH 01/16] Test debug build only and reduce output --- build.gradle | 15 +++++++++++++++ core/build.gradle | 13 ------------- mapzen-android-sdk/build.gradle | 13 ------------- mapzen-places-api/build.gradle | 13 ------------- samples/mapzen-android-sdk-sample/build.gradle | 5 ----- 5 files changed, 15 insertions(+), 44 deletions(-) diff --git a/build.gradle b/build.gradle index c60977fe..031bbecc 100644 --- a/build.gradle +++ b/build.gradle @@ -21,6 +21,21 @@ allprojects { } } +subprojects { + task verify(dependsOn: ['compileDebugSources', + 'testDebugUnitTest', + 'checkstyle', + 'lint']) + + tasks.withType(Test) { + testLogging { + exceptionFormat "full" + events "skipped", "passed", "failed" + showStandardStreams true + } + } +} + task clean(type: Delete) { delete rootProject.buildDir } diff --git a/core/build.gradle b/core/build.gradle index dc9bab8c..83fb68fe 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -60,14 +60,6 @@ android { } } -tasks.withType(Test) { - testLogging { - exceptionFormat "full" - events "started", "skipped", "passed", "failed" - showStandardStreams true - } -} - task checkstyle(type: Checkstyle) { configFile file("${project.rootDir}/config/checkstyle/checkstyle.xml") source 'src' @@ -77,11 +69,6 @@ task checkstyle(type: Checkstyle) { classpath = files() } -task verify(dependsOn: ['compileDebugSources', - 'test', - 'checkstyle', - 'lint']) - apply from: rootProject.file('gradle/gradle-mvn-push.gradle') task submodules { diff --git a/mapzen-android-sdk/build.gradle b/mapzen-android-sdk/build.gradle index 9df23167..e8d3c48c 100644 --- a/mapzen-android-sdk/build.gradle +++ b/mapzen-android-sdk/build.gradle @@ -58,14 +58,6 @@ android { } } -tasks.withType(Test) { - testLogging { - exceptionFormat "full" - events "started", "skipped", "passed", "failed" - showStandardStreams true - } -} - task checkstyle(type: Checkstyle) { configFile file("${project.rootDir}/config/checkstyle/checkstyle.xml") source 'src' @@ -75,11 +67,6 @@ task checkstyle(type: Checkstyle) { classpath = files() } -task verify(dependsOn: ['compileDebugSources', - 'test', - 'checkstyle', - 'lint']) - dependencies { compile 'com.mapzen:mapzen-core:1.3.0-SNAPSHOT' compile ('com.mapzen:on-the-road:1.2.0-SNAPSHOT') { diff --git a/mapzen-places-api/build.gradle b/mapzen-places-api/build.gradle index 7b025a64..75406015 100644 --- a/mapzen-places-api/build.gradle +++ b/mapzen-places-api/build.gradle @@ -55,14 +55,6 @@ android { } } -tasks.withType(Test) { - testLogging { - exceptionFormat "full" - events "started", "skipped", "passed", "failed" - showStandardStreams true - } -} - task checkstyle(type: Checkstyle) { configFile file("${project.rootDir}/config/checkstyle/checkstyle.xml") source 'src' @@ -72,11 +64,6 @@ task checkstyle(type: Checkstyle) { classpath = files() } -task verify(dependsOn: ['compileDebugSources', - 'test', - 'checkstyle', - 'lint']) - dependencies { compile 'com.android.support:appcompat-v7:25.1.0' compile 'com.mapzen:mapzen-core:1.3.0-SNAPSHOT' diff --git a/samples/mapzen-android-sdk-sample/build.gradle b/samples/mapzen-android-sdk-sample/build.gradle index df0c0be8..55bbda40 100644 --- a/samples/mapzen-android-sdk-sample/build.gradle +++ b/samples/mapzen-android-sdk-sample/build.gradle @@ -36,11 +36,6 @@ task checkstyle(type: Checkstyle) { classpath = files() } -task verify(dependsOn: ['compileDebugSources', - 'test', - 'checkstyle', - 'lint']) - dependencies { compile(project(':mapzen-android-sdk')) { transitive = true; From a53aaad8e8fe4f48ca2010c606ec4476471d9030 Mon Sep 17 00:00:00 2001 From: Chuck Greb Date: Tue, 7 Feb 2017 16:03:21 -0500 Subject: [PATCH 02/16] Gradle 3.3 and android-maven plugin 1.5 --- core/build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- mapzen-android-sdk/build.gradle | 2 +- mapzen-places-api/build.gradle | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/build.gradle b/core/build.gradle index 83fb68fe..9ca368aa 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -7,7 +7,7 @@ buildscript { } } dependencies { - classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1' + classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5' classpath 'net.researchgate:gradle-release:2.4.0' } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 86d6158a..f301b41c 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip diff --git a/mapzen-android-sdk/build.gradle b/mapzen-android-sdk/build.gradle index e8d3c48c..c51c3ba0 100644 --- a/mapzen-android-sdk/build.gradle +++ b/mapzen-android-sdk/build.gradle @@ -7,7 +7,7 @@ buildscript { } } dependencies { - classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1' + classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5' classpath 'net.researchgate:gradle-release:2.4.0' classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.6.1' } diff --git a/mapzen-places-api/build.gradle b/mapzen-places-api/build.gradle index 75406015..9ea662e9 100644 --- a/mapzen-places-api/build.gradle +++ b/mapzen-places-api/build.gradle @@ -7,7 +7,7 @@ buildscript { } } dependencies { - classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1' + classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5' classpath 'net.researchgate:gradle-release:2.4.0' classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.6.1' } From 95cf8aead8c82dd6f92a070b47e4dad5d80a8d3f Mon Sep 17 00:00:00 2001 From: Chuck Greb Date: Wed, 8 Feb 2017 10:58:52 -0500 Subject: [PATCH 03/16] Adds --configure-on-demand option to circle.yml --- circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index 902b431d..22c59ed6 100644 --- a/circle.yml +++ b/circle.yml @@ -19,7 +19,7 @@ dependencies: test: override: - - ./gradlew clean :core:install :core:verify :mapzen-android-sdk:verify :mapzen-places-api:verify + - ./gradlew clean :core:install :core:verify :mapzen-android-sdk:verify :mapzen-places-api:verify --configure-on-demand deployment: master: From ffb2ca4fb56826c510be675066796b28d6bd8544 Mon Sep 17 00:00:00 2001 From: Chuck Greb Date: Wed, 8 Feb 2017 11:06:00 -0500 Subject: [PATCH 04/16] Adds -PdisablePreDex option to circle.yml --- circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index 22c59ed6..e6b47a35 100644 --- a/circle.yml +++ b/circle.yml @@ -19,7 +19,7 @@ dependencies: test: override: - - ./gradlew clean :core:install :core:verify :mapzen-android-sdk:verify :mapzen-places-api:verify --configure-on-demand + - ./gradlew clean :core:install :core:verify :mapzen-android-sdk:verify :mapzen-places-api:verify --configure-on-demand -PdisablePreDex deployment: master: From 230b0da9d74e57941d210ecdad2a8fc32ceb679d Mon Sep 17 00:00:00 2001 From: Chuck Greb Date: Wed, 8 Feb 2017 11:29:12 -0500 Subject: [PATCH 05/16] Build and test modules in parallel --- circle.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index e6b47a35..c2a5a64d 100644 --- a/circle.yml +++ b/circle.yml @@ -3,6 +3,8 @@ machine: version: oraclejdk8 python: version: 2.7.10 + environment: + TEST_FLAGS: "--configure-on-demand -PdisablePreDex" checkout: post: @@ -19,7 +21,8 @@ dependencies: test: override: - - ./gradlew clean :core:install :core:verify :mapzen-android-sdk:verify :mapzen-places-api:verify --configure-on-demand -PdisablePreDex + - case $CIRCLE_NODE_INDEX in 0) ./gradlew :core:verify $TEST_FLAGS ;; 1) ./gradlew :mapzen-android-sdk:verify $TEST_FLAGS ;; 2) ./gradlew :mapzen-places-api:verify $TEST_FLAGS ;; esac: + parallel: true deployment: master: From 521ecacd7087bbf7603729e1eeca35688ee2b785 Mon Sep 17 00:00:00 2001 From: Chuck Greb Date: Wed, 8 Feb 2017 12:33:01 -0500 Subject: [PATCH 06/16] Deploy sample apps to AWS on release build only --- circle.yml | 5 +---- scripts/deploy-android-sdk-sample-app.sh | 2 +- scripts/deploy-places-api-sample-app.sh | 2 +- scripts/deploy-samples.sh | 11 +++++++++++ 4 files changed, 14 insertions(+), 6 deletions(-) create mode 100755 scripts/deploy-samples.sh diff --git a/circle.yml b/circle.yml index c2a5a64d..198fb209 100644 --- a/circle.yml +++ b/circle.yml @@ -16,8 +16,6 @@ dependencies: - echo y | android update sdk --all --no-ui --force --filter "build-tools-25.0.2" - echo y | android update sdk --all --no-ui --force --filter "android-25" - echo y | android update sdk --all --no-ui --force --filter "extra-android-m2repository" - - sudo apt-get update; sudo apt-get install s3cmd - - printf "[default]\naccess_key = $S3_ACCESS_KEY\n secret_key = $S3_SECRET_KEY" > ~/.s3cfg test: override: @@ -29,8 +27,7 @@ deployment: branch: master commands: - ./gradlew uploadArchives -PsonatypeUsername=$SONATYPE_NEXUS_SNAPSHOTS_USERNAME -PsonatypePassword=$SONATYPE_NEXUS_SNAPSHOTS_PASSWORD - - scripts/deploy-android-sdk-sample-app.sh - - scripts/deploy-places-api-sample-app.sh - ./gradlew aarSize countReleaseDexMethods permissions mapzen-android-sdk:dependencies --configuration compile + - scripts/deploy-samples.sh - pip install 'Circle-Tickler == 1.0.1' - tickle-circle mapzen documentation master $CIRCLE_TOKEN diff --git a/scripts/deploy-android-sdk-sample-app.sh b/scripts/deploy-android-sdk-sample-app.sh index 453caddc..260bbbff 100755 --- a/scripts/deploy-android-sdk-sample-app.sh +++ b/scripts/deploy-android-sdk-sample-app.sh @@ -2,6 +2,6 @@ # # Builds mapzen android sdk sample app and uploads APK to s3://android.mapzen.com/mapzen-android-sdk-sample-snapshots/. -./gradlew assembleDebug -PmapzenApiKey=$MAPZEN_API_KEY +./gradlew :samples_mapzen-android-sdk-sample:assembleDebug -PmapzenApiKey=$MAPZEN_API_KEY s3cmd put samples/mapzen-android-sdk-sample/build/outputs/apk/samples_mapzen-android-sdk-sample-debug.apk s3://android.mapzen.com/mapzen-android-sdk-sample-latest.apk s3cmd put samples/mapzen-android-sdk-sample/build/outputs/apk/samples_mapzen-android-sdk-sample-debug.apk s3://android.mapzen.com/mapzen-android-sdk-sample-snapshots/mapzen-android-sdk-sample-$CIRCLE_BUILD_NUM.apk diff --git a/scripts/deploy-places-api-sample-app.sh b/scripts/deploy-places-api-sample-app.sh index efe32674..7168775f 100755 --- a/scripts/deploy-places-api-sample-app.sh +++ b/scripts/deploy-places-api-sample-app.sh @@ -2,6 +2,6 @@ # # Builds mapzen places api sample app and uploads APK to s3://android.mapzen.com/mapzen-places-api-sample-snapshots/. -./gradlew assembleDebug -PmapzenApiKey=$MAPZEN_API_KEY +./gradlew :samples_mapzen-place-api-sample:assembleDebug -PmapzenApiKey=$MAPZEN_API_KEY s3cmd put samples/mapzen-places-api-sample/build/outputs/apk/samples_mapzen-places-api-sample-debug.apk s3://android.mapzen.com/mapzen-places-api-sample-latest.apk s3cmd put samples/mapzen-places-api-sample/build/outputs/apk/samples_mapzen-places-api-sample-debug.apk s3://android.mapzen.com/places-api-sample-snapshots/mapzen-places-api-sample-$CIRCLE_BUILD_NUM.apk diff --git a/scripts/deploy-samples.sh b/scripts/deploy-samples.sh new file mode 100755 index 00000000..b2badffe --- /dev/null +++ b/scripts/deploy-samples.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash +# +# Builds and uploads sample apps to S3 on release build only. + +if [[ ${PERFORM_RELEASE} ]] + then + sudo apt-get update; sudo apt-get install s3cmd + printf "[default]\naccess_key = $S3_ACCESS_KEY\n secret_key = $S3_SECRET_KEY" > ~/.s3cfg + scripts/deploy-android-sdk-sample-app.sh + scripts/deploy-places-api-sample-app.sh +fi From 7e6a2a5cc77d5e58a0ce1e944bc92ff988dfe040 Mon Sep 17 00:00:00 2001 From: Chuck Greb Date: Wed, 8 Feb 2017 12:42:19 -0500 Subject: [PATCH 07/16] Publish docs on release build only --- circle.yml | 3 +-- scripts/publish-docs.sh | 9 +++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) create mode 100755 scripts/publish-docs.sh diff --git a/circle.yml b/circle.yml index 198fb209..6e62103f 100644 --- a/circle.yml +++ b/circle.yml @@ -29,5 +29,4 @@ deployment: - ./gradlew uploadArchives -PsonatypeUsername=$SONATYPE_NEXUS_SNAPSHOTS_USERNAME -PsonatypePassword=$SONATYPE_NEXUS_SNAPSHOTS_PASSWORD - ./gradlew aarSize countReleaseDexMethods permissions mapzen-android-sdk:dependencies --configuration compile - scripts/deploy-samples.sh - - pip install 'Circle-Tickler == 1.0.1' - - tickle-circle mapzen documentation master $CIRCLE_TOKEN + - scripts/publish-docs.sh diff --git a/scripts/publish-docs.sh b/scripts/publish-docs.sh new file mode 100755 index 00000000..2c3d3362 --- /dev/null +++ b/scripts/publish-docs.sh @@ -0,0 +1,9 @@ +#!/usr/bin/env bash +# +# Triggers mapzen docs build to publish to https://mapzen.com/documentation/. + +if [[ ${PERFORM_RELEASE} ]] + then + pip install 'Circle-Tickler == 1.0.1' + tickle-circle mapzen documentation master $CIRCLE_TOKEN +fi From a7401d984f5056f1c91b085f8826960a4fb7b925 Mon Sep 17 00:00:00 2001 From: Chuck Greb Date: Wed, 8 Feb 2017 12:43:34 -0500 Subject: [PATCH 08/16] Install core lib to local .m2 repo before resolving dependencies --- circle.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/circle.yml b/circle.yml index 6e62103f..105ca7eb 100644 --- a/circle.yml +++ b/circle.yml @@ -16,6 +16,7 @@ dependencies: - echo y | android update sdk --all --no-ui --force --filter "build-tools-25.0.2" - echo y | android update sdk --all --no-ui --force --filter "android-25" - echo y | android update sdk --all --no-ui --force --filter "extra-android-m2repository" + - ./gradlew :core:install test: override: From 0a0a125f49c346b4c3fc2f567b8e6f2b3d1351fe Mon Sep 17 00:00:00 2001 From: Chuck Greb Date: Wed, 8 Feb 2017 13:04:28 -0500 Subject: [PATCH 09/16] Copy test results into archive folder --- circle.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/circle.yml b/circle.yml index 105ca7eb..5ea14161 100644 --- a/circle.yml +++ b/circle.yml @@ -22,6 +22,9 @@ test: override: - case $CIRCLE_NODE_INDEX in 0) ./gradlew :core:verify $TEST_FLAGS ;; 1) ./gradlew :mapzen-android-sdk:verify $TEST_FLAGS ;; 2) ./gradlew :mapzen-places-api:verify $TEST_FLAGS ;; esac: parallel: true + post: + - mkdir -p $CIRCLE_TEST_REPORTS/junit/ + - find . -type f -regex ".*/build/test-results/.*xml" -exec cp {} $CIRCLE_TEST_REPORTS/junit/ \; deployment: master: From 3ca4ec4a0104971f1345e720dcf78cf19c74ac1c Mon Sep 17 00:00:00 2001 From: Chuck Greb Date: Wed, 8 Feb 2017 13:05:44 -0500 Subject: [PATCH 10/16] Disable Javadoc tasks --- build.gradle | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build.gradle b/build.gradle index 031bbecc..293fc531 100644 --- a/build.gradle +++ b/build.gradle @@ -34,6 +34,8 @@ subprojects { showStandardStreams true } } + + tasks.withType(Javadoc).all { enabled = false } } task clean(type: Delete) { From 7bc86906d8530b8f0be3b7b387332974d2cb1c50 Mon Sep 17 00:00:00 2001 From: Chuck Greb Date: Wed, 8 Feb 2017 13:20:27 -0500 Subject: [PATCH 11/16] Build sample app but do not deploy to s3. Archive APKs on Circle CI. --- circle.yml | 6 ++++++ scripts/deploy-android-sdk-sample-app.sh | 1 - scripts/deploy-places-api-sample-app.sh | 1 - 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/circle.yml b/circle.yml index 5ea14161..ea621ce2 100644 --- a/circle.yml +++ b/circle.yml @@ -1,3 +1,7 @@ +general: + - /home/ubuntu/mapzen-android-sdk/samples/mapzen-android-sdk-sample/build/outputs/apk/ + - /home/ubuntu/mapzen-android-sdk/samples/mapzen-places-api-sample/build/outputs/apk/ + machine: java: version: oraclejdk8 @@ -30,6 +34,8 @@ deployment: master: branch: master commands: + - ./gradlew :samples_mapzen-android-sdk-sample:assembleDebug -PmapzenApiKey=$MAPZEN_API_KEY + - ./gradlew :samples_mapzen-place-api-sample:assembleDebug -PmapzenApiKey=$MAPZEN_API_KEY - ./gradlew uploadArchives -PsonatypeUsername=$SONATYPE_NEXUS_SNAPSHOTS_USERNAME -PsonatypePassword=$SONATYPE_NEXUS_SNAPSHOTS_PASSWORD - ./gradlew aarSize countReleaseDexMethods permissions mapzen-android-sdk:dependencies --configuration compile - scripts/deploy-samples.sh diff --git a/scripts/deploy-android-sdk-sample-app.sh b/scripts/deploy-android-sdk-sample-app.sh index 260bbbff..cbe729c6 100755 --- a/scripts/deploy-android-sdk-sample-app.sh +++ b/scripts/deploy-android-sdk-sample-app.sh @@ -2,6 +2,5 @@ # # Builds mapzen android sdk sample app and uploads APK to s3://android.mapzen.com/mapzen-android-sdk-sample-snapshots/. -./gradlew :samples_mapzen-android-sdk-sample:assembleDebug -PmapzenApiKey=$MAPZEN_API_KEY s3cmd put samples/mapzen-android-sdk-sample/build/outputs/apk/samples_mapzen-android-sdk-sample-debug.apk s3://android.mapzen.com/mapzen-android-sdk-sample-latest.apk s3cmd put samples/mapzen-android-sdk-sample/build/outputs/apk/samples_mapzen-android-sdk-sample-debug.apk s3://android.mapzen.com/mapzen-android-sdk-sample-snapshots/mapzen-android-sdk-sample-$CIRCLE_BUILD_NUM.apk diff --git a/scripts/deploy-places-api-sample-app.sh b/scripts/deploy-places-api-sample-app.sh index 7168775f..584d9c37 100755 --- a/scripts/deploy-places-api-sample-app.sh +++ b/scripts/deploy-places-api-sample-app.sh @@ -2,6 +2,5 @@ # # Builds mapzen places api sample app and uploads APK to s3://android.mapzen.com/mapzen-places-api-sample-snapshots/. -./gradlew :samples_mapzen-place-api-sample:assembleDebug -PmapzenApiKey=$MAPZEN_API_KEY s3cmd put samples/mapzen-places-api-sample/build/outputs/apk/samples_mapzen-places-api-sample-debug.apk s3://android.mapzen.com/mapzen-places-api-sample-latest.apk s3cmd put samples/mapzen-places-api-sample/build/outputs/apk/samples_mapzen-places-api-sample-debug.apk s3://android.mapzen.com/places-api-sample-snapshots/mapzen-places-api-sample-$CIRCLE_BUILD_NUM.apk From c652e2478f186654c2f60f7c42634b0f4a4805dc Mon Sep 17 00:00:00 2001 From: Chuck Greb Date: Wed, 8 Feb 2017 13:21:59 -0500 Subject: [PATCH 12/16] Update gradle options to limit memory use and dump heap on OOM error --- circle.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/circle.yml b/circle.yml index ea621ce2..891221e7 100644 --- a/circle.yml +++ b/circle.yml @@ -8,6 +8,7 @@ machine: python: version: 2.7.10 environment: + GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError"' TEST_FLAGS: "--configure-on-demand -PdisablePreDex" checkout: From fc11f1a2e0cf9307692f44f0faa0d7ff55657aa1 Mon Sep 17 00:00:00 2001 From: Chuck Greb Date: Wed, 8 Feb 2017 13:24:42 -0500 Subject: [PATCH 13/16] Relative path for artifacts folder --- circle.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/circle.yml b/circle.yml index 891221e7..78e09c63 100644 --- a/circle.yml +++ b/circle.yml @@ -1,6 +1,6 @@ general: - - /home/ubuntu/mapzen-android-sdk/samples/mapzen-android-sdk-sample/build/outputs/apk/ - - /home/ubuntu/mapzen-android-sdk/samples/mapzen-places-api-sample/build/outputs/apk/ + - "samples/mapzen-android-sdk-sample/build/outputs/apk" + - "samples/mapzen-places-api-sample/build/outputs/apk" machine: java: From 6e4c8bf64ddabae88670bf0b92da1ae98fca581c Mon Sep 17 00:00:00 2001 From: Chuck Greb Date: Wed, 8 Feb 2017 13:27:56 -0500 Subject: [PATCH 14/16] Circle CI syntax for "artifacts" --- circle.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/circle.yml b/circle.yml index 78e09c63..c8355c59 100644 --- a/circle.yml +++ b/circle.yml @@ -1,6 +1,7 @@ general: - - "samples/mapzen-android-sdk-sample/build/outputs/apk" - - "samples/mapzen-places-api-sample/build/outputs/apk" + artifacts: + - "samples/mapzen-android-sdk-sample/build/outputs/apk" + - "samples/mapzen-places-api-sample/build/outputs/apk" machine: java: From 3ede10573904d96626d951910867367c71e5c55d Mon Sep 17 00:00:00 2001 From: Chuck Greb Date: Wed, 8 Feb 2017 13:43:37 -0500 Subject: [PATCH 15/16] Test deployment on non-master branch --- circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index c8355c59..aa9e9775 100644 --- a/circle.yml +++ b/circle.yml @@ -34,7 +34,7 @@ test: deployment: master: - branch: master + branch: /^(?!master).*$/ commands: - ./gradlew :samples_mapzen-android-sdk-sample:assembleDebug -PmapzenApiKey=$MAPZEN_API_KEY - ./gradlew :samples_mapzen-place-api-sample:assembleDebug -PmapzenApiKey=$MAPZEN_API_KEY From a0f95ad7e51ae6ef90e2b71457bc8986ca424555 Mon Sep 17 00:00:00 2001 From: Chuck Greb Date: Wed, 8 Feb 2017 13:56:24 -0500 Subject: [PATCH 16/16] Revert full build including sample apps to master only --- circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index aa9e9775..c8355c59 100644 --- a/circle.yml +++ b/circle.yml @@ -34,7 +34,7 @@ test: deployment: master: - branch: /^(?!master).*$/ + branch: master commands: - ./gradlew :samples_mapzen-android-sdk-sample:assembleDebug -PmapzenApiKey=$MAPZEN_API_KEY - ./gradlew :samples_mapzen-place-api-sample:assembleDebug -PmapzenApiKey=$MAPZEN_API_KEY