Skip to content

Commit

Permalink
1.1.x branch now master
Browse files Browse the repository at this point in the history
  • Loading branch information
alexarchambault committed Sep 27, 2016
1 parent 69838f9 commit ab89be7
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ scala:
jdk:
- oraclejdk8
script: sbt ++${TRAVIS_SCALA_VERSION} validate $(if [[ "${TRAVIS_PULL_REQUEST}" == "false"
&& ${JAVA_HOME} == $(jdk_switcher home oraclejdk7) && "${TRAVIS_BRANCH}" == "1.1.x"
&& ${JAVA_HOME} == $(jdk_switcher home oraclejdk7) && "${TRAVIS_BRANCH}" == "master"
]]; then echo "publish"; fi)
sudo: false
env:
Expand All @@ -16,4 +16,4 @@ env:
- secure: iAA98AVcqwTd11RjJaA133t38gqoGDsnLP2m1Hm2PFrUGE1AXg1/0wX6bXmFCnj+NIfb2ItC9cyuepcvrfAfV4ukU66Yyh6DCgYaup6IhrgSCdck5zZcc2KrxsLyWVAyuClu7TG6xbjHc4os0hZZ0w95pUIG2sOyr4faH1GbeUQ=
branches:
only:
- 1.1.x
- master

0 comments on commit ab89be7

Please sign in to comment.