Skip to content

add a Travis build #165

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Nov 9, 2016
Merged

add a Travis build #165

merged 4 commits into from
Nov 9, 2016

Conversation

SethTisue
Copy link
Member

@SethTisue SethTisue commented Nov 9, 2016

and also upgrade to sbt 0.13.13 while we're at it

and Lightbend some Typesafes

@SethTisue SethTisue self-assigned this Nov 9, 2016
@SethTisue SethTisue force-pushed the travis branch 2 times, most recently from 5f3eced to 7735726 Compare November 9, 2016 01:57
@SethTisue SethTisue force-pushed the travis branch 4 times, most recently from d4ced67 to 8348a81 Compare November 9, 2016 02:18
maybe this tests a smidgen more
@SethTisue
Copy link
Member Author

review by @adriaanm

@adriaanm
Copy link
Contributor

adriaanm commented Nov 9, 2016

LGTM -- nice!

@adriaanm adriaanm merged commit 181b757 into scala:2.12.x Nov 9, 2016
@SethTisue SethTisue deleted the travis branch November 10, 2016 00:15
@SethTisue
Copy link
Member Author

SethTisue commented Nov 10, 2016

I just noticed that I had already done the Typesafe->Lightbend changes on the 2.11.x branch and they just hadn't been merged to 2.12.x.

But 2.11.x has an sbt-native-packager downgrade we don't want (we hope!) on 2.12.x. So I think we can just consider the two branches to have diverged, now. We expect 2.11.9 to be the last 2.11.x release anyway; any real action will be on 2.12.x from now on.

@adriaanm
Copy link
Contributor

SGTM

SethTisue added a commit to SethTisue/scala-dist that referenced this pull request Dec 5, 2016
as a consequence of the sbt version bump in
scala#165

fixes scala#171
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants