Skip to content

Commit 7d32d66

Browse files
authored
Merge pull request #576 from SethTisue/add-better-files
add better-files
2 parents 1214474 + 88d46c6 commit 7d32d66

File tree

2 files changed

+56
-48
lines changed

2 files changed

+56
-48
lines changed

configs/community.dbuild

Lines changed: 55 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,54 @@ build += {
138138

139139
projects: [
140140

141+
${vars.base} {
142+
name: "scala-parser-combinators"
143+
uri: ${vars.uris.scala-parser-combinators-uri}
144+
extra.exclude: ["scala-parser-combinatorsJS"]
145+
}
146+
147+
// if master proves difficult to track, the 0.6.x branch could be
148+
// used instead; see discussion at
149+
// https://github.com/scala/community-builds/issues/506
150+
${vars.base} {
151+
name: "scala-js"
152+
uri: ${vars.uris.scala-js-uri}
153+
extra: ${vars.base.extra} {
154+
// hopefully avoid intermittent OutOfMemoryErrors with default 1.5G heap?
155+
options: ["-Xmx2048m"]
156+
projects: [ tools, testSuite, stubs ]
157+
commands: ${vars.default-commands} [
158+
// - Disable compiler/test because it is very fragile.
159+
"set test in (Build.compiler, Test) := {}"
160+
// - Disable fatal Scaladoc warnings, also fragile
161+
"removeScalacOptions -Xfatal-warnings"
162+
// - We disable source map tests to save ourselves a `npm install source-map-support` on the workers.
163+
// Although only `testSuite` actually has tests, dbuild will try to run the tests for all projects
164+
// that `testSuite` depends on (transitively), so we need to set it in a bunch of places.
165+
"set Seq(library, testInterface, jUnitRuntime, testSuite).map(p => jsEnv in p := new org.scalajs.jsenv.nodejs.NodeJSEnv(org.scalajs.jsenv.nodejs.NodeJSEnv.Config().withExecutable(\""${vars.node}"\").withSourceMap(false)))"
166+
]
167+
}
168+
}
169+
170+
// frozen (June 2017) at an April 2017 commit; newer commits
171+
// broke the scalacheck subproject of specs2
172+
${vars.base} {
173+
name: "scalacheck"
174+
uri: ${vars.uris.scalacheck-uri}
175+
extra.projects: ["jvm"] // no Scala.js please
176+
// because of new unused warnings in 2.12.2
177+
extra.commands: ${vars.default-commands} [ "removeScalacOptions -Xfatal-warnings" ]
178+
}
179+
180+
${vars.base} {
181+
name: "scalatest"
182+
uri: ${vars.uris.scalatest-uri}
183+
extra: ${vars.base.extra} {
184+
projects: ["scalatest", "scalactic"]
185+
test-tasks: ["compile"] // TODO run tests -- need to exclude browser-based tests somehow
186+
}
187+
}
188+
141189
${vars.base} {
142190
name: "scala-partest-interface"
143191
uri: ${vars.uris.scala-partest-interface-uri}
@@ -155,22 +203,6 @@ build += {
155203
uri: ${vars.uris.scala-swing-uri}
156204
}
157205

158-
${vars.base} {
159-
name: "scala-parser-combinators"
160-
uri: ${vars.uris.scala-parser-combinators-uri}
161-
extra.exclude: ["scala-parser-combinatorsJS"]
162-
}
163-
164-
// frozen (June 2017) at an April 2017 commit; newer commits
165-
// broke the scalacheck subproject of specs2
166-
${vars.base} {
167-
name: "scalacheck"
168-
uri: ${vars.uris.scalacheck-uri}
169-
extra.projects: ["jvm"] // no Scala.js please
170-
// because of new unused warnings in 2.12.2
171-
extra.commands: ${vars.default-commands} [ "removeScalacOptions -Xfatal-warnings" ]
172-
}
173-
174206
// tracking master as of December 2016. if master proves unstable,
175207
// we could try "release-0.8" (or a newer branch if there is one)
176208
${vars.base} {
@@ -243,15 +275,6 @@ build += {
243275
]
244276
}
245277

246-
${vars.base} {
247-
name: "scalatest"
248-
uri: ${vars.uris.scalatest-uri}
249-
extra: ${vars.base.extra} {
250-
projects: ["scalatest", "scalactic"]
251-
test-tasks: ["compile"] // TODO run tests -- need to exclude browser-based tests somehow
252-
}
253-
}
254-
255278
${vars.base} {
256279
name: "genjavadoc"
257280
uri: ${vars.uris.genjavadoc-uri}
@@ -354,29 +377,6 @@ build += {
354377
uri: ${vars.uris.sbinary-uri}
355378
}
356379

357-
// if master proves difficult to track, the 0.6.x branch could be
358-
// used instead; see discussion at
359-
// https://github.com/scala/community-builds/issues/506
360-
${vars.base} {
361-
name: "scala-js"
362-
uri: ${vars.uris.scala-js-uri}
363-
extra: ${vars.base.extra} {
364-
// hopefully avoid intermittent OutOfMemoryErrors with default 1.5G heap?
365-
options: ["-Xmx2048m"]
366-
projects: [ tools, testSuite, stubs ]
367-
commands: ${vars.default-commands} [
368-
// - Disable compiler/test because it is very fragile.
369-
"set test in (Build.compiler, Test) := {}"
370-
// - Disable fatal Scaladoc warnings, also fragile
371-
"removeScalacOptions -Xfatal-warnings"
372-
// - We disable source map tests to save ourselves a `npm install source-map-support` on the workers.
373-
// Although only `testSuite` actually has tests, dbuild will try to run the tests for all projects
374-
// that `testSuite` depends on (transitively), so we need to set it in a bunch of places.
375-
"set Seq(library, testInterface, jUnitRuntime, testSuite).map(p => jsEnv in p := new org.scalajs.jsenv.nodejs.NodeJSEnv(org.scalajs.jsenv.nodejs.NodeJSEnv.Config().withExecutable(\""${vars.node}"\").withSourceMap(false)))"
376-
]
377-
}
378-
}
379-
380380
// forked (April 2017) for 2.12.2 and 2.13 compat.
381381
// can be unforked once these PRs are merged:
382382
// * https://github.com/lihaoyi/utest/pull/107
@@ -1187,4 +1187,11 @@ build += {
11871187
// actually run the whole thing as part of the community build?)
11881188
}
11891189

1190+
${vars.base} {
1191+
name: "better-files"
1192+
uri: ${vars.uris.better-files-uri}
1193+
// test failure reported upstream at https://github.com/pathikrit/better-files/issues/165
1194+
extra.test-tasks: ["compile"]
1195+
}
1196+
11901197
]}

configs/project-refs.conf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ vars.uris: {
1414
argonaut-uri: "https://github.com/argonaut-io/argonaut.git"
1515
async-uri: "https://github.com/scala/async.git"
1616
atto-uri: "https://github.com/tpolecat/atto.git#series/0.5.x"
17+
better-files-uri: "https://github.com/pathikrit/better-files.git"
1718
blaze-uri: "https://github.com/http4s/blaze.git#v0.12.4"
1819
breeze-uri: "https://github.com/scalanlp/breeze.git"
1920
cachecontrol-uri: "https://github.com/playframework/cachecontrol.git"

0 commit comments

Comments
 (0)