mirrors/bitcoin-s
1
0
Fork 0
mirror of https://github.com/bitcoin-s/bitcoin-s.git synced 2025-03-19 21:45:36 +01:00
Code Issues Projects Releases Packages Wiki Activity

PoC: Attempt to enable parallel execution on CI now that we have github ac… (#2396)

Browse source 
* Attempt to enable parallel execution on CI now that we have github actions

* Try removing 'testWithDbSettings' to simplify build
This commit is contained in:
Chris Stewart 2020-12-19 17:00:30 -06:00 • committed by GitHub
parent 0f037f3fb9
commit 719ccbe932
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
build.sbt
View file

@ -313,7 +313,7 @@ lazy val chain = project
lazy val chainTest = project lazy val chainTest = project
.in(file("chain-test")) .in(file("chain-test"))
.settings(CommonSettings.testWithDbSettings: _*) .settings(CommonSettings.testSettings: _*)
.settings(chainDbSettings: _*) .settings(chainDbSettings: _*)
.settings( .settings(
name := "bitcoin-s-chain-test", name := "bitcoin-s-chain-test",
@ -411,7 +411,7 @@ lazy val node =
lazy val nodeTest = lazy val nodeTest =
project project
.in(file("node-test")) .in(file("node-test"))
.settings(CommonSettings.testWithDbSettings: _*) .settings(CommonSettings.testSettings: _*)
.settings(nodeDbSettings: _*) .settings(nodeDbSettings: _*)
.settings( .settings(
name := "bitcoin-s-node-test", name := "bitcoin-s-node-test",
@ -492,7 +492,7 @@ lazy val wallet = project
lazy val walletTest = project lazy val walletTest = project
.in(file("wallet-test")) .in(file("wallet-test"))
.settings(CommonSettings.testWithDbSettings: _*) .settings(CommonSettings.testSettings: _*)
.settings(walletDbSettings: _*) .settings(walletDbSettings: _*)
.settings( .settings(
name := "bitcoin-s-wallet-test", name := "bitcoin-s-wallet-test",

11
project/CommonSettings.scala
View file

@ -65,9 +65,7 @@ object CommonSettings {
Seq("-source", "1.8", "-target", "1.8") Seq("-source", "1.8", "-target", "1.8")
} }
}, },
licenses += ("MIT", url("http://opensource.org/licenses/MIT")), licenses += ("MIT", url("http://opensource.org/licenses/MIT"))
// Travis has performance issues on macOS
Test / parallelExecution := !(Properties.isMac && isCI)
) )
private val commonCompilerOpts = { private val commonCompilerOpts = {
@ -118,13 +116,6 @@ object CommonSettings {
publish / skip := true publish / skip := true
) ++ settings ) ++ settings
lazy val testWithDbSettings: Seq[Setting[_]] = Seq(
// To make in-memory DBs work properly
Test / fork := false,
// To avoid deadlock issues with SQLite
Test / parallelExecution := true
) ++ testSettings
lazy val prodSettings: Seq[Setting[_]] = settings lazy val prodSettings: Seq[Setting[_]] = settings
lazy val binariesPath = lazy val binariesPath =