Skip to content

Commit

Permalink
Fix ci and formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
tgodzik committed Mar 27, 2024
1 parent debb37f commit 7653717
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 10 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Expand Up @@ -71,8 +71,8 @@ jobs:
.github/setup-test-projects.sh &&\
./mill -i 'backend[_].test.compile' &&\
./mill -i 'frontend[_].test.compile' &&\
./mill -i 'backend[2.12.18].test' &&\
./mill -i 'frontend[2.12.18].test'
./mill -i 'backend[2.12.19].test' &&\
./mill -i 'frontend[2.12.19].test'
shell: bash

jvm-tests:
Expand Down
3 changes: 1 addition & 2 deletions bloop-rifle/src/bloop/rifle/internal/Operations.scala
Expand Up @@ -144,8 +144,7 @@ object Operations {
case s: BloopRifleConfig.Address.DomainSocket =>
val writeOutputToOpt0 =
if (bloopServerSupportsFileTruncating) Some(s.outputPath)
else None
(Seq(s"daemon:${s.path}"), "bloop.Bloop", writeOutputToOpt0)
else None(Seq(s"daemon:${s.path}"), "bloop.Bloop", writeOutputToOpt0)
}

val extraJavaOpts =
Expand Down
6 changes: 2 additions & 4 deletions bloop-rifle/src/bloop/rifle/internal/SnailgunClient.scala
Expand Up @@ -39,12 +39,10 @@ class SnailgunClient(openSocket: () => Socket) extends snailgun.Client {
catch {
case t: SocketException =>
logger.debug("Tracing an ignored socket exception...")
logger.trace(t)
()
logger.trace(t)()
case t: SocketExceptionLike =>
logger.debug("Tracing an ignored socket exception-like...")
logger.trace(t)
()
logger.trace(t)()
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion build.sc
Expand Up @@ -542,7 +542,7 @@ object bridges extends Module {

object `scala-native-04` extends Cross[ScalaNative04](Dependencies.scalaVersions: _*)
object `scala-native-05` extends Cross[ScalaNative05](Dependencies.scalaVersions: _*)

class ScalaNative04(val crossScalaVersion: String) extends ScalaNative(crossScalaVersion, 4)
class ScalaNative05(val crossScalaVersion: String) extends ScalaNative(crossScalaVersion, 5)

Expand Down
Expand Up @@ -28,7 +28,7 @@ class BspMetalsClientSpec(
override val protocol: BspProtocol
) extends BspBaseSuite {
private val testedScalaVersion = BuildInfo.scalaVersion
private val semanticdbVersion = "4.8.4"
private val semanticdbVersion = "4.9.2"
private val javaSemanticdbVersion = "0.5.7"

private val semanticdbJar = s"semanticdb-scalac_$testedScalaVersion-$semanticdbVersion.jar"
Expand Down

0 comments on commit 7653717

Please sign in to comment.