Skip to content

Commit

Permalink
Merge pull request #119 from bpitman/master
Browse files Browse the repository at this point in the history
Update publishing
  • Loading branch information
bpitman committed Jul 9, 2015
2 parents bd179c0 + 6f4de6a commit c725b9d
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 16 deletions.
4 changes: 1 addition & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@ scala:
- 2.11.5
sudo: false
script:
- "make get-ivy-cache build"
after_success:
- "make publish"
- "make get-ivy-cache build publish"
env:
global:
- secure: "d5Pgq/vnpLRqE2feJ1xmLbKL2CPdPS3BTC7MMpviQlRz/ExrcsbY+32Ben+nJJnYIQnEQqlPEKabCNI9kDYuTZmWlQLzaR42D7OcUSptUipJbYSb5Om8YaKHDhjCM9k88/tU5rtojmYIq9648R26M973A8l5maR+gzBK80zT3xY="
Expand Down
2 changes: 1 addition & 1 deletion project/Bintray.scala
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ object Bintray {
bintrayRepository := "maven",
bintrayPackage := "iep",
bintrayOrganization := Some("netflixoss"),
//bintrayReleaseOnPublish := false,
bintrayReleaseOnPublish := false,
licenses += ("Apache-2.0", url("https://www.apache.org/licenses/LICENSE-2.0.txt")),

storeBintrayCredentials := IO.write(bintrayCredentialsFile.value, api.template(sys env "bintrayUser", sys env "bintrayKey")),
Expand Down
24 changes: 12 additions & 12 deletions publishViaTravis.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ if [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_TAG" != "" ]; then

sbt storeBintrayCredentials

sbt +publish
sbt +publish +bintrayRelease
RETVAL=$?

if [ $RETVAL -eq 0 ]; then
Expand All @@ -19,17 +19,17 @@ if [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_TAG" != "" ]; then
exit 1
fi

# snyc to Sonatype
export SONA_USER=$sonatypeUsername
export SONA_PASS=$sonatypePassword
sbt +bintray::syncMavenCentral
RETVAL=$?
if [ $RETVAL -eq 0 ]; then
echo 'Completed sync to Sonatype!'
else
echo 'Sync to Sonatype failed.'
exit 2
fi
# # snyc to Sonatype
# export SONA_USER=$sonatypeUsername
# export SONA_PASS=$sonatypePassword
# sbt +bintray::syncMavenCentral
# RETVAL=$?
# if [ $RETVAL -eq 0 ]; then
# echo 'Completed sync to Sonatype!'
# else
# echo 'Sync to Sonatype failed.'
# exit 2
# fi

else
echo 'Bintray Upload => Not a tagged build so will not upload'
Expand Down

0 comments on commit c725b9d

Please sign in to comment.