build: reenable maven upload

fixed branch name retrieval issue
9 years ago · afa9bcde7c
parent daff85d651
commit afa9bcde7c
2 changed files with 3 additions and 1 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -25,6 +25,7 @@ install:
 script:
  - ./gradlew check
  - ./gradlew createZipDistribution
+  - "[ $TRAVIS_BRANCH == 'master' ] && [ $TRAVIS_PULL_REQUEST == 'false' ] && ./gradlew uploadArchives;"

 before_deploy:
  - export RELEASE_DIST=$(ls build/distributions/*.zip)
--- a/version.gradle
+++ b/version.gradle
@ -68,7 +68,8 @@ task configureVersionInfo {
        if (System.env.TRAVIS_TAG != null) {
            jmeGitTag = System.env.TRAVIS_TAG
        }
-        if (System.env.TRAVIS_PULL_REQUEST != null) {
+        if (System.env.TRAVIS_PULL_REQUEST != null && 
+            System.env.TRAVIS_PULL_REQUEST != "false") {
            jmeBranchName += "-pr-" + System.env.TRAVIS_PULL_REQUEST
        }