luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix in travis script 

No artifacts of coursier were pushed to sonatype because of that
This commit is contained in:
Alexandre Archambault 2015-06-17 15:02:52 +02:00
parent eb086c002f
commit 92450b1876
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -8,7 +8,7 @@ jdk:
install:
- npm install xmldom
- npm install xhr2
script: project/travis.sh "$TRAVIS_SCALA_VERSION" "$TRAVIS_PULL_REQUEST" "$TRAVIS_BRANCH"
script: project/travis.sh "$TRAVIS_SCALA_VERSION" "$TRAVIS_PULL_REQUEST" "$TRAVIS_BRANCH" "$(jdk_switcher home oraclejdk7)"
env:
global:
- secure: miHFMwVRD/yjOLy794nOwc2lJTMyL5O0MXABT9ksg5ejQy1FrFVc2YH86Agp80W02/lGLGl0qWCiK1TBcs9q4Apt01nkD1a/0/iuTRm//bdhnu8BbRxFITf+2cyYJVytKPsF585aHldMv1rwZs3TDaTzEEecAEki5r50yyTVo7ycG0lVj9aVWXerKRMIT54Wb8M6nqbyRB1jGWT0ETNU13vOvQznPTUXQG5hsiKnGYRf8T3umOMdOHpV0rvdwYqAIMsikaAFcYCS5P/pLXMtmRHICH9KUG8TV/ST07p1BXtbBg9y1Q+lpnXotXh4ZNoWOp8B6v7fxJ/WlLYTDROWCiHJ4s2V4Di00db/nW4OWrEEBlrh7vJ/npZqyt9V9YeNv6alxi+DCESwusgvD4Cx5c3zh+2X6RB6BYwWHlFnd80rmsLe4R4fFUcc8E/ZR9vUFjP1CsQKqfJ5yfKR6V+n8jK8FjLpoaU9PHPo2H4V3FZM/fCLcxhE37vfaYI7/O7MqE/cdGpZIuz7g3c4toWCgNZJDn8iJCPmrgcbW5zbfDxvWU2K816ycgnUwSQ5dufrJpAbLNrjR1O8EPRkMDDp9bB7/4RVQvfDfP9GGoiHPHHgxGzY0Lf5bm+Bj1mRfB5/SXHd3IjhUCD9q7eD1/ANifEYALC5BJ4TB8RhQUPU8uM=

10
project/travis.sh
View File

@ -7,14 +7,16 @@ TRAVIS_PULL_REQUEST="$1"
shift
TRAVIS_BRANCH="$1"
shift
JDK7_HOME="$1"
shift
function isPr() {
function isNotPr() {
[ "$TRAVIS_PULL_REQUEST" = "false" ]
}
function isJdk7() {
[ "$JAVA_HOME" = "$(jdk_switcher home oraclejdk7)" ]
[ "$JAVA_HOME" = "$JDK7_HOME" ]
}
function isMaster() {
@ -22,7 +24,7 @@ function isMaster() {
}
if echo "$TRAVIS_SCALA_VERSION" | grep -q "^2\.10"; then
if isPr && isJdk7 && isMaster; then
if isNotPr && isJdk7 && isMaster; then
EXTRA_SBT_ARGS="core-jvm/publish core-js/publish cli/publish"
else
EXTRA_SBT_ARGS=""
@ -30,7 +32,7 @@ if echo "$TRAVIS_SCALA_VERSION" | grep -q "^2\.10"; then
sbt ++${TRAVIS_SCALA_VERSION} core-jvm/test core-js/test cli/test $EXTRA_SBT_ARGS
else
if isPr && isJdk7 && isMaster; then
if isNotPr && isJdk7 && isMaster; then
EXTRA_SBT_ARGS="publish"
else
EXTRA_SBT_ARGS=""