scalafmt On Compile (#940)

* scalafmt On Compile * Disable scalafmtOnCompile for all CI runs * Make CI use travis default CI var
bitcoin-s · Jun 23, 2020 · d3641c3 · d3641c3
1 parent 1eadf09
commit d3641c3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -89,7 +89,6 @@ jobs:
       os: osx
       name: "macOS wallet and node tests"
       env:
-        - CI="1"
         - TEST_COMMAND="walletTest/test wallet/coverageReport wallet/coverageAggregate wallet/coveralls nodeTest/test node/coverageReport node/coverageAggregate node/coveralls"
       scala: 2.13.2
 

diff --git a/core/src/main/scala/org/bitcoins/core/util/EnvUtil.scala b/core/src/main/scala/org/bitcoins/core/util/EnvUtil.scala
@@ -11,5 +11,5 @@ object EnvUtil {
 
   lazy val isWindows: Boolean = osName.startsWith("Windows")
 
-  lazy val isCI: Boolean = Properties.envOrNone("CI").contains("1")
+  lazy val isCI: Boolean = Properties.envOrNone("CI").contains("true")
 }
diff --git a/inThisBuild.sbt b/inThisBuild.sbt
@@ -1,6 +1,10 @@
+import scala.util.Properties
+
 val scala2_12 = "2.12.11"
 val scala2_13 = "2.13.2"
 
+scalafmtOnCompile in ThisBuild := !Properties.envOrNone("CI").contains("true")
+
 scalaVersion in ThisBuild := scala2_13
 
 crossScalaVersions in ThisBuild := List(scala2_13, scala2_12)