Skip to content

Commit 6ad2542

Browse files
committed
Setup releases from CI
Upgrades the build to sbt 1.2 so that we can use sbt-ci-relase to automate releases from Travis CI.
1 parent cf6ec35 commit 6ad2542

File tree

5 files changed

+27
-29
lines changed

5 files changed

+27
-29
lines changed

.jvmopts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
-Xss4m
2+
-Xms1G
3+
-Xmx8G
4+
-XX:ReservedCodeCacheSize=1024m
5+
-XX:+TieredCompilation
6+
-XX:+CMSClassUnloadingEnabled
7+

.travis.yml

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,29 @@
11
language: scala
22
sudo: required
33
dist: trusty
4-
script:
5-
# plz is like ++ except it skips projects that are not defined for that scala version.
6-
- sbt "plz $TRAVIS_SCALA_VERSION test"
74
jdk:
85
- oraclejdk8
9-
scala:
10-
- 2.10.7
11-
- 2.11.12
12-
- 2.12.6
13-
- 2.13.0-M5
14-
env:
15-
- SCALAJS_VERSION=0.6.25
166
matrix:
7+
include:
8+
script: sbt "++$TRAVIS_SCALA_VERSION test"
9+
jobs:
1710
include:
1811
- scala: 2.10.7
1912
jdk: openjdk7
20-
before_install:
21-
- curl https://raw.githubusercontent.com/scala-native/scala-native/master/scripts/travis_setup.sh | bash -x
13+
- scala: 2.10.7
14+
- scala: 2.11.12
15+
before_install:
16+
- curl https://raw.githubusercontent.com/scala-native/scala-native/master/scripts/travis_setup.sh | bash -x
17+
- scala: 2.12.6
18+
- scala: 2.13.0-M5
19+
20+
# Release stable release on tag push and snapshot on merge to master
21+
- stage: release
22+
script: sbt ci-release
23+
2224
cache:
2325
directories:
24-
- $HOME/.sbt/0.13/dependency
26+
- $HOME/.sbt/1.0/dependency
2527
- $HOME/.sbt/boot/scala*
2628
- $HOME/.sbt/launchers
2729
- $HOME/.ivy2/cache

build.sbt

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,31 +8,20 @@ val scala213 = "2.13.0-M5"
88
val baseSettings = Seq(
99
organization := "com.lihaoyi",
1010
name := "sourcecode",
11-
version := "0.1.5-SNAPSHOT",
1211
scalaVersion := scala211,
1312
crossScalaVersions := Seq(scala210, scala211, scala212, scala213),
14-
scmInfo := Some(ScmInfo(
15-
browseUrl = url("https://github.com/lihaoyi/sourcecode"),
16-
connection = "scm:git:[email protected]:lihaoyi/sourcecode.git"
17-
)),
1813
homepage := Some(url("https://github.com/lihaoyi/sourcecode")),
1914
licenses := Seq("MIT" -> url("http://www.opensource.org/licenses/mit-license.html")),
2015
developers += Developer(
2116
email = "[email protected]",
2217
id = "lihaoyi",
2318
name = "Li Haoyi",
2419
url = url("https://github.com/lihaoyi")
25-
),
26-
publishTo := Some("releases" at "https://oss.sonatype.org/service/local/staging/deploy/maven2")
27-
)
28-
lazy val noPublish = Seq(
29-
publishArtifact := false,
30-
publish := {},
31-
publishLocal := {}
20+
)
3221
)
3322

3423
baseSettings
35-
noPublish
24+
skip in publish := true
3625

3726
def macroDependencies(version: String) =
3827
Seq(

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=0.13.17
1+
sbt.version=1.2.1

project/build.sbt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ val scalaJSVersion =
44

55
addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion)
66

7-
addSbtPlugin("com.eed3si9n" % "sbt-doge" % "0.1.5")
8-
addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.8.0")
7+
addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.2.2")
8+
addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.9.4")
99
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "0.6.0")
1010
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.3.8")
1111
addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "0.6.0")

0 commit comments

Comments
 (0)