From 1c588f6bff0ec85a6cf3e60a27de2d379909730c Mon Sep 17 00:00:00 2001 From: "R. Tyler Croy" Date: Sat, 4 Jul 2015 14:02:58 -0700 Subject: [PATCH] Change the automatic deployment to only operate when a user has published a tag that successfully builds --- .travis.yml | 1 + build.gradle | 21 ++++++++------------- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9ffd83b..8ae8fd9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,5 @@ language: java +# Only the oraclejdk7 build on a tag will actually release jdk: - oraclejdk7 - oraclejdk8 diff --git a/build.gradle b/build.gradle index 91f7422..84506a4 100644 --- a/build.gradle +++ b/build.gradle @@ -7,19 +7,9 @@ apply plugin: 'application' group = "com.github.lookout" description = "A utility for monitoring the delay of Kafka consumers" -version = '0.2' +version = '0.2.1' mainClassName = 'com.github.lookout.verspaetung.Main' -defaultTasks 'clean', 'check' - - -/* Little bit of version shenanigans to get a MINOR number supplied by Travis */ - -if (System.env.TRAVIS_BUILD_NUMBER) { - version = "${version}.${System.env.TRAVIS_BUILD_NUMBER}" -} -else { - version = "${version}.0-SNAPSHOT" -} +defaultTasks 'clean', 'check', 'assemble' //////////////////////////////////////////////////////////////////////////////// @@ -102,7 +92,12 @@ bintray { user = project.bintrayUser key = project.bintrayKey publish = true - dryRun = true + /* + * Only only publish when we're tagging a release and if we've executed on + * the JDK7 build. This is to prevent multiple attempts by the build matrix + * to publish the artifacts + */ + dryRun = !((System.env.TRAVIS_TAG as boolean) && (System.env.TRAVIS_JDK_VERSION == 'oraclejdk7')) configurations = ['archives'] pkg {