enable CI on all branches and pull requests

memo33 · memo33 · commit aabdf5751544 · 2025-06-05T19:31:14.000+02:00
diff --git a/.github/workflows/scala.yml b/.github/workflows/scala.yml
@@ -7,9 +7,7 @@ name: Scala CI
 
 on:
   push:
-    branches: [ "master", "staging" ]
   pull_request:
-    branches: [ "master", "staging" ]
 
 permissions:
   contents: read
diff --git a/src/main/scala/scripts/ConflictingOverridesChecker.scala b/src/main/scala/scripts/ConflictingOverridesChecker.scala
@@ -8,7 +8,7 @@ import Rul2Model.{Driveside, Rhd, Lhd, RhdAndLhd, rulesHaveSameOutput}
 /** Checks for conflicting/duplicate RUL2 code. There are two modes of operation:
   *
   * {{{
-  * SBT_OPTS="-Xmx2G" sbt -no-color conflictingOverridesCheck
+  * SBT_OPTS="-Xmx2G" sbt conflictingOverridesCheck
   * }}}
   * to check all RUL2 code for new conflicting overrides (that are not tagged yet).
   * The new conflicts are printed to stdout. Exit code will be non-zero if new

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ import Rul2Model.{Driveside, Rhd, Lhd, RhdAndLhd, rulesHaveSameOutput}`
`8`	`8`	`/** Checks for conflicting/duplicate RUL2 code. There are two modes of operation:`
`9`	`9`	`*`
`10`	`10`	`* {{{`
`11`		`- * SBT_OPTS="-Xmx2G" sbt -no-color conflictingOverridesCheck`
	`11`	`+ * SBT_OPTS="-Xmx2G" sbt conflictingOverridesCheck`
`12`	`12`	`* }}}`
`13`	`13`	`* to check all RUL2 code for new conflicting overrides (that are not tagged yet).`
`14`	`14`	`* The new conflicts are printed to stdout. Exit code will be non-zero if new`