Skip to content

Commit

Permalink
Merge Travis recognizes branch '3.1.x'
Browse files Browse the repository at this point in the history
  • Loading branch information
simonbasle committed Jun 22, 2018
2 parents e013678 + 87944b3 commit 5b5ceb5
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions travis-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
echo "only reactor-test was touched -> selective test"
./gradlew :reactor-test:check
fi
elif [ "$TRAVIS_BRANCH" == "master" ] || [ "$TRAVIS_BRANCH" == "3.0.x" ]; then
echo "master or 3.0.x: this is a merge test -> full test"
elif [ "$TRAVIS_BRANCH" == "master" ] || [ "$TRAVIS_BRANCH" == "3.0.x" ] || [ "$TRAVIS_BRANCH" == "3.1.x" ]; then
echo "master or 3.0.x/3.1.x: this is a merge test -> full test"
./gradlew check
else
COMMIT_RANGE=${TRAVIS_COMMIT_RANGE/.../..}
Expand Down

0 comments on commit 5b5ceb5

Please sign in to comment.