Use a Gradle property to differntiate between releases and snapshots

Travis-CI is checking out a detached head
chkpnt · Apr 14, 2020 · 9fcdc15 · 9fcdc15
1 parent 92ad898
commit 9fcdc15
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -35,4 +35,4 @@ after_success:
   - if [[ $TRAVIS_BRANCH == 'master' ]]; then ./scripts/publish-ghpages.sh; fi
   - if [[ $TRAVIS_BRANCH == 'master' ]]; then ./scripts/publish-sonarqube.sh; fi
   - if [[ $TRAVIS_BRANCH == 'master' ]]; then ./scripts/publish-codecov.sh; fi
-  - if [[ $TRAVIS_BRANCH == 'release' ]]; then ./scripts/deploy.sh; fi
+  - if [[ $TRAVIS_BRANCH == 'release' ]]; then ./scripts/deploy-release.sh; fi
diff --git a/gradle/versioning.gradle b/gradle/versioning.gradle
@@ -5,16 +5,18 @@ buildscript {
 
 import org.ajoberstar.grgit.*
 
+setToDefaultIfNotExists('isRelease', false)
+
 task initBuildMetadata {
     def major = 0
     def minor = 4
     def patch = 0
-    def repo = Grgit.open(dir: project.file('.'))
-    if (repo.branch.current().name == 'release') {
+    if (project.isRelease.toBoolean()) {
         project.version = "${major}.${minor}.${patch}"
     } else {
         project.version = "${major}.${minor}.${patch}-SNAPSHOT"
     }
+    def repo = Grgit.open(dir: project.file('.'))
     project.ext.revision = repo.head().id
     project.ext.buildDate = new Date().toString()
 }

diff --git a/scripts/deploy.sh → scripts/deploy-release.sh b/scripts/deploy.sh → scripts/deploy-release.sh
@@ -4,4 +4,5 @@
           -Pgradle.publish.secret=$GRADLE_PUBLISH_SECRET \
           -PbintrayUser=chkpnt \
           -PbintrayApiKey=$BINTRAY_API_KEY \
+          -PisRelease=true \
           bintrayUpload publishPlugins