Skip to content

Commit 66cd055

Browse files
abersnazeabersnaze
committed
More changes to get the travis releases working.
1 parent 33ecaef commit 66cd055

3 files changed

Lines changed: 11 additions & 2 deletions

File tree

‎build.gradle‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,13 @@ dependencies {
1616
testCompile 'org.mockito:mockito-core:1.8.5'
1717
}
1818

19+
// support for snapshot/final releases with the various branches RxJava uses
20+
nebulaRelease {
21+
addReleaseBranchPattern(/\d+\.\d+\.\d+/)
22+
addReleaseBranchPattern('HEAD')
23+
}
24+
25+
if (project.hasProperty('release.useLastTag')) {
26+
tasks.prepare.enabled = false
27+
}
1928

‎gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
version=1.0.0-RC1-SNAPSHOT
1+
release.scope=patch

‎gradle/buildViaTravis.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# This script will build the project.
33

44
if [ "$TRAVIS_PULL_REQUEST" ]; then
5-
echo -e 'Build Pull Request => Branch ['$TRAVIS_BRANCH']'
5+
echo -e "Build Pull Request #$TRAVIS_PULL_REQUEST => Branch [$TRAVIS_BRANCH]"
66
./gradlew -Prelease.useLastTag=true build
77
elif [ ! "$TRAVIS_PULL_REQUEST" ] && [ "$TRAVIS_TAG" == "" ]; then
88
echo -e 'Build Branch with Snapshot => Branch ['$TRAVIS_BRANCH']'

0 commit comments

Comments
 (0)