Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gifs/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ FROM ubuntu:24.04
RUN curl -fsSL https://deb.nodesource.com/setup_12.x | bash -
RUN apt-get update
RUN apt-get install ca-certificates-java openjdk-17-jdk openjdk-17-jre -y
RUN DEBIAN_FRONTEND=noninteractive apt-get install -y pv curl clang rubygems nodejs python3-pip &&\
RUN DEBIAN_FRONTEND=noninteractive apt-get install -y pv curl clang rubygems ruby-dev nodejs python3-pip &&\
Comment thread
Gedochao marked this conversation as resolved.
rm -rf /var/lib/apt/lists/* &&\
gem install rouge &&\
pip3 install --break-system-packages asciinema==2.1.0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import scala.Console.println
import scala.build.Ops.EitherThrowOps
import scala.build.options.{BuildOptions, InternalOptions}
import scala.build.tests.util.BloopServer
import scala.build.{Build, BuildThreads, Directories, LocalRepo, Position}
import scala.build.{Build, BuildThreads, Directories, LocalRepo}

class SourceGeneratorTests extends TestUtil.ScalaCliBuildSuite {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ trait FixScalafixRulesTestDefinitions {
}
}

test("explicit-result-types") {
def explicitResultTypes() = {
val original: String =
"""|package foo
|
Expand Down Expand Up @@ -295,6 +295,16 @@ trait FixScalafixRulesTestDefinitions {
}
}

if actualScalaVersion.contains("RC")
then // seems to be a no-op for 3.8.4-RC3, specifically
test("explicit-result-types".flaky) {
Comment thread
Gedochao marked this conversation as resolved.
explicitResultTypes()
}
else
test("explicit-result-types") {
explicitResultTypes()
}

for {
(semanticDbOptions, expectedSuccess) <- Seq(
Nil -> true, // .semanticdb files should be implicitly generated when Scalafix is run
Expand Down
2 changes: 1 addition & 1 deletion project/deps/package.mill
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ object Scala {
def scala3NextPrefix = "3.8"
def scala3Next = s"$scala3NextPrefix.3" // the newest/next version of Scala
def scala3NextAnnounced = s"$scala3NextPrefix.2" // the newest/next version of Scala that's been announced
def scala3NextRc = "3.8.4-RC2" // the latest RC version of Scala Next
def scala3NextRc = "3.8.4-RC3" // the latest RC version of Scala Next
def scala3NextRcAnnounced = "3.8.4-RC2" // the latest announced RC version of Scala Next

// The Scala version used to build the CLI itself.
Expand Down