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
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# we need rpmbuild but it's unlikely to be whitelisted, according to
# https://github.com/travis-ci/apt-package-whitelist/pull/1700
sudo: required
before_install:
- sudo apt-get -qq update
- sudo apt-get install -y rpm

language: scala
jdk: oraclejdk8

script:
- sbt -Dproject.version=2.12.0 s3Upload::mappings

cache:
directories:
- $HOME/.ivy2
- $HOME/.sbt/boot
- $HOME/.sbt/launchers
before_cache:
- find $HOME/.sbt -name "*.lock" | xargs rm
- find $HOME/.ivy2 -name "ivydata-*.properties" | xargs rm
16 changes: 8 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,20 @@ into a Scala `$version` distribution (zip, tar.gz, deb, rpm, and msi).

To build a distribution, run:

* `universal:package-bin` - Builds the universal zip installer
* `universal-docs:package-bin` - Builds the universal documentation zip
* `debian:package-bin` - Builds the Debian DEB file. *requires dpkg-deb*
* `rpm:package-bin` - Builds the yum RPM file. *requires rpmbuild*
* `windows:package-bin` - Builds the Windows MSI. *requires WiX 3.6*
* `universal:packageBin` - Builds the universal zip installer
* `universal-docs:packageBin` - Builds the universal documentation zip
* `debian:packageBin` - Builds the Debian DEB file. *requires dpkg-deb*
* `rpm:packageBin` - Builds the yum RPM file. *requires rpmbuild*
* `windows:packageBin` - Builds the Windows MSI. *requires WiX 3.6*

Alternatively, the `s3-upload` task's mappings are configured based on the platform
Alternatively, the `s3Upload` task's mappings are configured based on the platform
the installer is running on. On Windows, it builds the MSI; on another platform,
it'll create and upload the other packages in the above list. (Use `s3Upload::mappings` for a dry-run.)

The version of Scala to package is derived from the most recent git tag,
or you can specify it using `-Dproject.version`.

This packager only works for Scala 2.11+ releases (starting with M8),
This packager only works for Scala 2.11+ releases,
as earlier ones did not publish the `scala-dist` artifact to maven.

Due to limited resources, the native packages are quite rudimentary.
Expand All @@ -44,7 +44,7 @@ The specification also used to be in this repo -- it is now a part of the main r

## Contributing ##
Please read the [Scala Pull Request Policy](https://github.com/scala/scala/wiki/Pull-Request-Policy)
and sign the [CLA](http://typesafe.com/contribute/cla/scala).
and sign the [CLA](http://www.lightbend.com/contribute/cla/scala).

The branching structure mimics that of [scala/scala](https://github.com/scala/scala):
branches for 2.11.x, 2.12.x, etc.
Expand Down
2 changes: 1 addition & 1 deletion project/ScalaDist.scala
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ object ScalaDist {
useNativeZip ++ // use native zip to preserve +x permission on scripts
Seq(
name := "scala",
maintainer := "LAMP/EPFL and Typesafe, Inc. <scala-internals@googlegroups.com>",
maintainer := "LAMP/EPFL and Lightbend, Inc. <scala-internals@googlegroups.com>",
packageSummary := "Scala Programming Language Distribution", // this will be spliced into the middle of a sentence --> no period (it also determines sort order, so, no "The" in front)
packageDescription := "Have the best of both worlds. Construct elegant class hierarchies for maximum code reuse and extensibility, implement their behavior using higher-order functions. Or anything in-between.",
crossPaths := false,
Expand Down
2 changes: 1 addition & 1 deletion project/Unix.scala
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ object Unix {

// RPM Specific
name in Rpm := "scala",
rpmVendor := "typesafe",
rpmVendor := "lightbend",
rpmUrl := Some("http://github.com/scala/scala"),
rpmLicense := Some("BSD"),
rpmGroup := Some("Development/Languages"),
Expand Down
4 changes: 2 additions & 2 deletions project/Wix.scala
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ object Wix {
// wixProductComments := "Scala Programming language for use in Windows.",

wixProductConfig := makeProductConfig((stagingDirectory in Universal).value, (stagingDirectory in UniversalDocs).value),
wixProductConfig <<= (wixProductConfig
wixProductConfig := (wixProductConfig
dependsOn (stage in Universal)
dependsOn (stage in UniversalDocs)),
dependsOn (stage in UniversalDocs)).value,

packageBin in Windows := {
val versioned = target.value / s"${name.value}-${version.value}.msi"
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=0.13.9
sbt.version=0.13.13
2 changes: 1 addition & 1 deletion scripts/jobs/release/website/archives
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# need to re-declare it as an array, not sure how to do that directly in jenkins
declare -a sshCharaArgs="$sshCharaArgs"

url="http://downloads.typesafe.com/scala/$version"
url="http://downloads.lightbend.com/scala/$version"

if [[ "$version" =~ .*-nightly ]]
then archivesDir="~linuxsoft/archives/scala/nightly/2.12.x"
Expand Down
2 changes: 1 addition & 1 deletion src/linux/copyright
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

scala

Copyright: LAMP/EPFL and Typesafe, Inc.
Copyright: LAMP/EPFL and Lightbend, Inc.

The home page of scala package is at: http://github.com/scala/scala-dist.

Expand Down