diff options
| -rw-r--r-- | .circleci/config.yml | 21 | ||||
| -rw-r--r-- | .mergify.yml | 3 | ||||
| -rw-r--r-- | Makefile | 7 | ||||
| -rw-r--r-- | build.sbt | 1 | ||||
| -rw-r--r-- | project/plugins.sbt | 2 | ||||
| -rw-r--r-- | scalastyle-config.xml | 110 | ||||
| -rw-r--r-- | scalastyle-test-config.xml | 109 |
7 files changed, 3 insertions, 250 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index 78ae63b2..3fac3c38 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -25,7 +25,6 @@ executors: TREADLE_REPO: git@github.com:freechipsproject/treadle.git TREADLE_BRANCH: master TREADLE_REV: master - CHECKSTYLE_LIMIT: 40 SBT_ARGS: "" commands: @@ -152,17 +151,6 @@ jobs: - test-chisel: scalaVersion: "++2.12.11" - checkstyle-chisel: - executor: chisel-executor - steps: - - attach_workspace: - at: /home/chisel - - - run: - command: | - # We expect the "[info]" field from sbt so the warning count will be in column 4 - (cd chisel3 && cat /dev/null | sbt $SBT_ARGS scalastyle | gawk -v WARN_FAIL=2 -e '/scalastyle Found [0-9]+ warnings/ { print $0; if ($4 > ENVIRON["CHECKSTYLE_LIMIT"]) WARN_FAIL=1; else if (WARN_FAIL == 2) WARN_FAIL=0 }' -e 'END { exit WARN_FAIL}') - workflows: build_and_test: @@ -180,11 +168,4 @@ workflows: - test-chisel-2_12: requires: - build-treadle - - checkstyle-chisel: - # Strictly speaking, this is only dependent on build-firrtl, - # but it is faster than the test jobs so if it fails, - # it fails the entire build before we get a chance to complete the tests. - # If we make it dependent on at least one of the tests, - # there's a better chance to see if the tests fail before we flag a style failure - requires: - - test-chisel-2_12 + diff --git a/.mergify.yml b/.mergify.yml index 1698ab94..c4310021 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -10,7 +10,6 @@ pull_request_rules: conditions: - "status-success=ci/circleci: build-firrtl" - "status-success=ci/circleci: build-prep" - - "status-success=ci/circleci: checkstyle-chisel" - "status-success=ci/circleci: test-chisel-2_11" - "status-success=ci/circleci: test-chisel-2_12" - status-success=license/cla @@ -66,7 +65,6 @@ pull_request_rules: conditions: - "status-success=ci/circleci: build-firrtl" - "status-success=ci/circleci: build-prep" - - "status-success=ci/circleci: checkstyle-chisel" - "status-success=ci/circleci: test-chisel-2_11" - "status-success=ci/circleci: test-chisel-2_12" - "status-success=ci/circleci: check-binary-compatibility" @@ -86,7 +84,6 @@ pull_request_rules: conditions: - "status-success=ci/circleci: build-firrtl" - "status-success=ci/circleci: build-prep" - - "status-success=ci/circleci: checkstyle-chisel" - "status-success=ci/circleci: test-chisel-2_11" - "status-success=ci/circleci: test-chisel-2_12" - "status-success=ci/circleci: check-binary-compatibility" @@ -28,7 +28,7 @@ CHISEL_VERSION = $(shell "$(SBT)" $(SBT_FLAGS) "show version" | tail -n 1 | cut TEST_OUTPUT_DIR ?= ./test_run_dur RM_DIRS := $(TEST_OUTPUT_DIR) -.PHONY: smoke publish-local pubishLocal check clean jenkins-build coverage scaladoc test checkstyle compile \ +.PHONY: smoke publish-local pubishLocal check clean jenkins-build coverage scaladoc test compile \ mill.build mill.test mill.publishLocal mill.build.all mill.test.all mill.publishLocal.all mill-tools default: publishLocal @@ -42,9 +42,6 @@ publish-local publishLocal: test: $(SBT) $(SBT_FLAGS) test -checkstyle: - $(SBT) $(SBT_FLAGS) scalastyle test:scalastyle - coverage: $(SBT) $(SBT_FLAGS) coverage test $(SBT) $(SBT_FLAGS) coverageReport coverageAggregate @@ -72,7 +69,7 @@ site: jenkins-build: clean $(SBT) $(SBT_FLAGS) test $(SBT) $(SBT_FLAGS) clean publishLocal - $(SBT) $(SBT_FLAGS) scalastyle coverage test + $(SBT) $(SBT_FLAGS) coverage test $(SBT) $(SBT_FLAGS) coverageReport # Compile and package jar @@ -46,7 +46,6 @@ lazy val commonSettings = Seq ( scalacOptions := Seq("-deprecation", "-feature") ++ scalacOptionsVersion(scalaVersion.value), libraryDependencies += "org.scala-lang" % "scala-reflect" % scalaVersion.value, addCompilerPlugin("org.scalamacros" % "paradise" % "2.1.1" cross CrossVersion.full), - (scalastyleConfig in Test) := (baseDirectory in root).value / "scalastyle-test-config.xml", // Use the root project's unmanaged base for all sub-projects. unmanagedBase := (unmanagedBase in root).value, // Since we want to examine the classpath to determine if a dependency on firrtl is required, diff --git a/project/plugins.sbt b/project/plugins.sbt index 48f031e2..48c2fba3 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -4,8 +4,6 @@ resolvers += Classpaths.sbtPluginReleases resolvers += "jgit-repo" at "https://download.eclipse.org/jgit/maven" -addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "1.0.0") - addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.6.1") addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "1.4.0") diff --git a/scalastyle-config.xml b/scalastyle-config.xml deleted file mode 100644 index 67aa8afe..00000000 --- a/scalastyle-config.xml +++ /dev/null @@ -1,110 +0,0 @@ -<scalastyle> - <name>Scalastyle standard configuration</name> - <check level="warning" class="org.scalastyle.file.FileTabChecker" enabled="true"></check> - <check level="warning" class="org.scalastyle.file.FileLengthChecker" enabled="true"> - <parameters> - <parameter name="maxFileLength"><![CDATA[800]]></parameter> - </parameters> - </check> - <check level="warning" class="org.scalastyle.file.HeaderMatchesChecker" enabled="true"> - <parameters> - <parameter name="header"><![CDATA[// See LICENSE for license details.]]></parameter> - </parameters> - </check> - <check level="warning" class="org.scalastyle.scalariform.SpacesAfterPlusChecker" enabled="true"></check> - <check level="warning" class="org.scalastyle.file.WhitespaceEndOfLineChecker" enabled="true"></check> - <check level="warning" class="org.scalastyle.scalariform.SpacesBeforePlusChecker" enabled="true"></check> - <check level="warning" class="org.scalastyle.file.FileLineLengthChecker" enabled="true"> - <parameters> - <parameter name="maxLineLength"><![CDATA[120]]></parameter> - <parameter name="tabSize"><![CDATA[4]]></parameter> - </parameters> - </check> - <check level="warning" class="org.scalastyle.scalariform.ClassNamesChecker" enabled="true"> - <parameters> - <parameter name="regex"><![CDATA[[A-Z][A-Za-z]*]]></parameter> - </parameters> - </check> - <check level="warning" class="org.scalastyle.scalariform.ObjectNamesChecker" enabled="true"> - <parameters> - <parameter name="regex"><![CDATA[[A-Z][A-Za-z]*]]></parameter> - </parameters> - </check> - <check level="warning" class="org.scalastyle.scalariform.PackageObjectNamesChecker" enabled="true"> - <parameters> - <parameter name="regex"><![CDATA[^[a-z][A-Za-z]*$]]></parameter> - </parameters> - </check> - <check level="warning" class="org.scalastyle.scalariform.EqualsHashCodeChecker" enabled="true"></check> - <check level="warning" class="org.scalastyle.scalariform.IllegalImportsChecker" enabled="true"> - <parameters> - <parameter name="illegalImports"><![CDATA[sun._,java.awt._]]></parameter> - </parameters> - </check> - <check level="warning" class="org.scalastyle.scalariform.ParameterNumberChecker" enabled="true"> - <parameters> - <parameter name="maxParameters"><![CDATA[8]]></parameter> - </parameters> - </check> - <check level="warning" class="org.scalastyle.scalariform.MagicNumberChecker" enabled="true"> - <parameters> - <parameter name="ignore"><![CDATA[-1,0,1,2,8,10,16]]></parameter> - </parameters> - </check> - <check level="warning" class="org.scalastyle.scalariform.NoWhitespaceBeforeLeftBracketChecker" enabled="true"></check> - <check level="warning" class="org.scalastyle.scalariform.NoWhitespaceAfterLeftBracketChecker" enabled="true"></check> - <check level="warning" class="org.scalastyle.scalariform.ReturnChecker" enabled="false"></check> - <check level="warning" class="org.scalastyle.scalariform.NullChecker" enabled="false"></check> - <check level="warning" class="org.scalastyle.scalariform.NoCloneChecker" enabled="false"></check> - <check level="warning" class="org.scalastyle.scalariform.NoFinalizeChecker" enabled="true"></check> - <check level="warning" class="org.scalastyle.scalariform.CovariantEqualsChecker" enabled="true"></check> - <check level="warning" class="org.scalastyle.scalariform.StructuralTypeChecker" enabled="true"></check> - <check level="warning" class="org.scalastyle.file.RegexChecker" enabled="true"> - <parameters> - <parameter name="regex"><![CDATA[;(\r|)\n]]></parameter> - </parameters> - <customMessage>No lines ending with a ;</customMessage> - </check> - <check level="warning" class="org.scalastyle.file.RegexChecker" enabled="true"> - <parameters> - <parameter name="regex"><![CDATA[println]]></parameter> - </parameters> - </check> - <check level="warning" class="org.scalastyle.scalariform.NumberOfTypesChecker" enabled="true"> - <parameters> - <parameter name="maxTypes"><![CDATA[30]]></parameter> - </parameters> - </check> - <check level="warning" class="org.scalastyle.scalariform.CyclomaticComplexityChecker" enabled="true"> - <parameters> - <parameter name="maximum"><![CDATA[10]]></parameter> - </parameters> - </check> - <check level="warning" class="org.scalastyle.scalariform.UppercaseLChecker" enabled="true"></check> - <check level="warning" class="org.scalastyle.scalariform.SimplifyBooleanExpressionChecker" enabled="true"></check> - <check level="warning" class="org.scalastyle.scalariform.IfBraceChecker" enabled="true"> - <parameters> - <parameter name="singleLineAllowed"><![CDATA[true]]></parameter> - <parameter name="doubleLineAllowed"><![CDATA[false]]></parameter> - </parameters> - </check> - <check level="warning" class="org.scalastyle.scalariform.MethodLengthChecker" enabled="true"> - <parameters> - <parameter name="maxLength"><![CDATA[50]]></parameter> - </parameters> - </check> - <check level="warning" class="org.scalastyle.scalariform.MethodNamesChecker" enabled="true"> - <parameters> - <parameter name="regex"><![CDATA[^[a-z][A-Za-z0-9_]*(_=)?$]]></parameter> - <parameter name="ignoreRegex"><![CDATA[^(\+[&%]?|\-[&%]?|\*|/|%|&|\||\^|<|>|\|\||&&|:=|<>|<=|>=|!=|===|=/=|<<|>>|##|unary_(~|\-%?|!))$]]></parameter> - </parameters> - </check> - <check level="warning" class="org.scalastyle.scalariform.NumberOfMethodsInTypeChecker" enabled="true"> - <parameters> - <parameter name="maxMethods"><![CDATA[30]]></parameter> - </parameters> - </check> - <check level="warning" class="org.scalastyle.scalariform.PublicMethodsHaveTypeChecker" enabled="true"></check> - <check level="warning" class="org.scalastyle.file.NewLineAtEofChecker" enabled="true"></check> - <check level="warning" class="org.scalastyle.file.NoNewLineAtEofChecker" enabled="false"></check> -</scalastyle> diff --git a/scalastyle-test-config.xml b/scalastyle-test-config.xml deleted file mode 100644 index 50953819..00000000 --- a/scalastyle-test-config.xml +++ /dev/null @@ -1,109 +0,0 @@ -<scalastyle> - <name>Scalastyle configuration for Chisel3 unit tests</name> - <check level="warning" class="org.scalastyle.file.FileTabChecker" enabled="true"></check> - <check level="warning" class="org.scalastyle.file.FileLengthChecker" enabled="true"> - <parameters> - <parameter name="maxFileLength"><![CDATA[800]]></parameter> - </parameters> - </check> - <check level="warning" class="org.scalastyle.file.HeaderMatchesChecker" enabled="true"> - <parameters> - <parameter name="header"><![CDATA[// See LICENSE for license details.]]></parameter> - </parameters> - </check> - <check level="warning" class="org.scalastyle.scalariform.SpacesAfterPlusChecker" enabled="true"></check> - <check level="warning" class="org.scalastyle.file.WhitespaceEndOfLineChecker" enabled="true"></check> - <check level="warning" class="org.scalastyle.scalariform.SpacesBeforePlusChecker" enabled="true"></check> - <check level="warning" class="org.scalastyle.file.FileLineLengthChecker" enabled="true"> - <parameters> - <parameter name="maxLineLength"><![CDATA[120]]></parameter> - <parameter name="tabSize"><![CDATA[4]]></parameter> - </parameters> - </check> - <check level="warning" class="org.scalastyle.scalariform.ClassNamesChecker" enabled="true"> - <parameters> - <parameter name="regex"><![CDATA[[A-Z][A-Za-z]*]]></parameter> - </parameters> - </check> - <check level="warning" class="org.scalastyle.scalariform.ObjectNamesChecker" enabled="true"> - <parameters> - <parameter name="regex"><![CDATA[[A-Z][A-Za-z]*]]></parameter> - </parameters> - </check> - <check level="warning" class="org.scalastyle.scalariform.PackageObjectNamesChecker" enabled="true"> - <parameters> - <parameter name="regex"><![CDATA[^[a-z][A-Za-z]*$]]></parameter> - </parameters> - </check> - <check level="warning" class="org.scalastyle.scalariform.EqualsHashCodeChecker" enabled="true"></check> - <check level="warning" class="org.scalastyle.scalariform.IllegalImportsChecker" enabled="true"> - <parameters> - <parameter name="illegalImports"><![CDATA[sun._,java.awt._]]></parameter> - </parameters> - </check> - <check level="warning" class="org.scalastyle.scalariform.ParameterNumberChecker" enabled="true"> - <parameters> - <parameter name="maxParameters"><![CDATA[8]]></parameter> - </parameters> - </check> - <!-- Numerical constants are used a lot in test setups, it would be burdensome to require each one be its own val - declaration. --> - <check level="warning" class="org.scalastyle.scalariform.MagicNumberChecker" enabled="false"></check> - <!-- Scalatest's exception checking syntax looks like "a [ChiselException] should be thrownBy". --> - <check level="warning" class="org.scalastyle.scalariform.NoWhitespaceBeforeLeftBracketChecker" enabled="false"></check> - <check level="warning" class="org.scalastyle.scalariform.NoWhitespaceAfterLeftBracketChecker" enabled="true"></check> - <check level="warning" class="org.scalastyle.scalariform.ReturnChecker" enabled="false"></check> - <check level="warning" class="org.scalastyle.scalariform.NullChecker" enabled="false"></check> - <check level="warning" class="org.scalastyle.scalariform.NoCloneChecker" enabled="false"></check> - <check level="warning" class="org.scalastyle.scalariform.NoFinalizeChecker" enabled="true"></check> - <check level="warning" class="org.scalastyle.scalariform.CovariantEqualsChecker" enabled="true"></check> - <check level="warning" class="org.scalastyle.scalariform.StructuralTypeChecker" enabled="true"></check> - <check level="warning" class="org.scalastyle.file.RegexChecker" enabled="true"> - <parameters> - <parameter name="regex"><![CDATA[^.*;(\r|)\n]]></parameter> - </parameters> - <customMessage>No lines ending with a ;</customMessage> - </check> - <check level="warning" class="org.scalastyle.file.RegexChecker" enabled="true"> - <parameters> - <parameter name="regex"><![CDATA[println]]></parameter> - </parameters> - </check> - <check level="warning" class="org.scalastyle.scalariform.NumberOfTypesChecker" enabled="true"> - <parameters> - <parameter name="maxTypes"><![CDATA[30]]></parameter> - </parameters> - </check> - <check level="warning" class="org.scalastyle.scalariform.CyclomaticComplexityChecker" enabled="true"> - <parameters> - <parameter name="maximum"><![CDATA[10]]></parameter> - </parameters> - </check> - <check level="warning" class="org.scalastyle.scalariform.UppercaseLChecker" enabled="true"></check> - <check level="warning" class="org.scalastyle.scalariform.SimplifyBooleanExpressionChecker" enabled="true"></check> - <check level="warning" class="org.scalastyle.scalariform.IfBraceChecker" enabled="true"> - <parameters> - <parameter name="singleLineAllowed"><![CDATA[true]]></parameter> - <parameter name="doubleLineAllowed"><![CDATA[false]]></parameter> - </parameters> - </check> - <check level="warning" class="org.scalastyle.scalariform.MethodLengthChecker" enabled="true"> - <parameters> - <parameter name="maxLength"><![CDATA[50]]></parameter> - </parameters> - </check> - <check level="warning" class="org.scalastyle.scalariform.MethodNamesChecker" enabled="true"> - <parameters> - <parameter name="regex"><![CDATA[^[a-z][A-Za-z0-9_]*(_=)?$]]></parameter> - <parameter name="ignoreRegex"><![CDATA[^(\+[&%]?|\-[&%]?|\*|/|%|&|\||\^|<|>|\|\||&&|:=|<>|<=|>=|!=|===|=/=|<<|>>|##|unary_(~|\-%?|!))$]]></parameter> - </parameters> - </check> - <check level="warning" class="org.scalastyle.scalariform.NumberOfMethodsInTypeChecker" enabled="true"> - <parameters> - <parameter name="maxMethods"><![CDATA[30]]></parameter> - </parameters> - </check> - <check level="warning" class="org.scalastyle.scalariform.PublicMethodsHaveTypeChecker" enabled="true"></check> - <check level="warning" class="org.scalastyle.file.NewLineAtEofChecker" enabled="true"></check> - <check level="warning" class="org.scalastyle.file.NoNewLineAtEofChecker" enabled="false"></check> -</scalastyle> |