From 719ccbe93267220492f9f6da3283d9d607d0321c Mon Sep 17 00:00:00 2001 From: Chris Stewart Date: Sat, 19 Dec 2020 17:00:30 -0600 Subject: [PATCH] =?UTF-8?q?PoC:=20Attempt=20to=20enable=20parallel=20execu?= =?UTF-8?q?tion=20on=20CI=20now=20that=20we=20have=20github=20ac=E2=80=A6?= =?UTF-8?q?=20(#2396)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Attempt to enable parallel execution on CI now that we have github actions * Try removing 'testWithDbSettings' to simplify build --- build.sbt | 6 +++--- project/CommonSettings.scala | 11 +---------- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/build.sbt b/build.sbt index 2517ed57a7..e60555a15b 100644 --- a/build.sbt +++ b/build.sbt @@ -313,7 +313,7 @@ lazy val chain = project lazy val chainTest = project .in(file("chain-test")) - .settings(CommonSettings.testWithDbSettings: _*) + .settings(CommonSettings.testSettings: _*) .settings(chainDbSettings: _*) .settings( name := "bitcoin-s-chain-test", @@ -411,7 +411,7 @@ lazy val node = lazy val nodeTest = project .in(file("node-test")) - .settings(CommonSettings.testWithDbSettings: _*) + .settings(CommonSettings.testSettings: _*) .settings(nodeDbSettings: _*) .settings( name := "bitcoin-s-node-test", @@ -492,7 +492,7 @@ lazy val wallet = project lazy val walletTest = project .in(file("wallet-test")) - .settings(CommonSettings.testWithDbSettings: _*) + .settings(CommonSettings.testSettings: _*) .settings(walletDbSettings: _*) .settings( name := "bitcoin-s-wallet-test", diff --git a/project/CommonSettings.scala b/project/CommonSettings.scala index a1b7a6fa04..6f12c42922 100644 --- a/project/CommonSettings.scala +++ b/project/CommonSettings.scala @@ -65,9 +65,7 @@ object CommonSettings { Seq("-source", "1.8", "-target", "1.8") } }, - licenses += ("MIT", url("http://opensource.org/licenses/MIT")), - // Travis has performance issues on macOS - Test / parallelExecution := !(Properties.isMac && isCI) + licenses += ("MIT", url("http://opensource.org/licenses/MIT")) ) private val commonCompilerOpts = { @@ -118,13 +116,6 @@ object CommonSettings { publish / skip := true ) ++ 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 binariesPath =