Skip to content
This repository was archived by the owner on May 4, 2019. It is now read-only.

Commit e5e4e1c

Browse files
committed
Merge branch 'release/0.8.8'
2 parents f9def2b + 31cc09a commit e5e4e1c

File tree

3 files changed

+13
-5
lines changed

3 files changed

+13
-5
lines changed

gradle/buildViaTravis-linux.sh

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,15 @@ elif [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" == "master" ];
2424
# Master Branch
2525
echo -e 'Build Master for Release => Branch ['$TRAVIS_BRANCH']'
2626
export ORG_GRADLE_PROJECT_releaseType=release
27-
./gradlew clean build publish --stacktrace
27+
./gradlew clean build --stacktrace
28+
elif [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_TAG" != "" ]; then
29+
# Tag
30+
echo -e 'Build Tag for Release => Tag ['$TRAVIS_TAG']'
31+
export ORG_GRADLE_PROJECT_releaseType=release
32+
./gradlew clean build bintrayUpload --stacktrace
2833
else
2934
# Feature Branch
3035
echo -e 'Build Branch => Branch ['$TRAVIS_BRANCH']'
3136
export ORG_GRADLE_PROJECT_releaseType=snapshot
32-
export ORG_GRADLE_PROJECT_commitHash=${TRAVIS_COMMIT::7}
3337
./gradlew clean build publish --stacktrace
3438
fi

gradle/buildViaTravis.sh

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,15 @@ elif [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" == "master" ];
2424
# Master Branch
2525
echo -e 'Build Master for Release => Branch ['$TRAVIS_BRANCH']'
2626
export ORG_GRADLE_PROJECT_releaseType=release
27-
./gradlew clean build publish --stacktrace
27+
./gradlew clean build --stacktrace
28+
elif [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_TAG" != "" ]; then
29+
# Tag
30+
echo -e 'Build Tag for Release => Tag ['$TRAVIS_TAG']'
31+
export ORG_GRADLE_PROJECT_releaseType=release
32+
./gradlew clean build bintrayUpload --stacktrace
2833
else
2934
# Feature Branch
3035
echo -e 'Build Branch => Branch ['$TRAVIS_BRANCH']'
3136
export ORG_GRADLE_PROJECT_releaseType=snapshot
32-
export ORG_GRADLE_PROJECT_commitHash=${TRAVIS_COMMIT::7}
3337
./gradlew clean build publish --stacktrace
3438
fi

gradle/java.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ if ("$version".contains('SNAPSHOT')) {
118118
} else {
119119
bintray {
120120
user = project.hasProperty('bintrayUser') ? project.property('bintrayUser') : System.getenv('BINTRAY_USER')
121-
key = project.hasProperty('bintrayKey') ? project.property('bintrayKey') : System.getenv('BINTRAY_KEY')
121+
key = project.hasProperty('bintrayKey') ? project.property('bintrayKey') : System.getenv('f')
122122
publications = ['maven']
123123

124124
publish = (osdetector.os == 'osx')

0 commit comments

Comments
 (0)