diff --git a/.github/workflows/binary-compatibility-checks.yml b/.github/workflows/binary-compatibility-checks.yml index 18b6c831c81..d58c9f37c9b 100644 --- a/.github/workflows/binary-compatibility-checks.yml +++ b/.github/workflows/binary-compatibility-checks.yml @@ -47,20 +47,20 @@ jobs: - name: Cache Coursier cache # https://github.com/coursier/cache-action/releases - # v6.4.5 - uses: coursier/cache-action@1ff273bff02a8787bc9f1877d347948af647956d + # v7.0.0 + uses: coursier/cache-action@bebeeb0e6f48ebad66d3783946588ecf43114433 - - name: Set up JDK 11 + - name: Set up JDK 25 # https://github.com/coursier/setup-action/releases # v1.3.5 uses: coursier/setup-action@7bde40eee928896f074dbb76d22dd772eed5c65f with: - jvm: temurin:1.11 + jvm: temurin:1.25 - - name: Test/compile + - name: compile run: |- cp .jvmopts-ci .jvmopts - sbt "+~ ${{ matrix.scalaVersion }} Test/compile" + sbt "+~ ${{ matrix.scalaVersion }} compile" - name: Report MiMa Binary Issues run: |- diff --git a/.github/workflows/build-test-prValidation.yml b/.github/workflows/build-test-prValidation.yml index 6c7bdafcd4a..b9bf24b9b73 100644 --- a/.github/workflows/build-test-prValidation.yml +++ b/.github/workflows/build-test-prValidation.yml @@ -38,8 +38,8 @@ jobs: - name: Cache Coursier cache # https://github.com/coursier/cache-action/releases - # v6.4.5 - uses: coursier/cache-action@1ff273bff02a8787bc9f1877d347948af647956d + # v7.0.0 + uses: coursier/cache-action@bebeeb0e6f48ebad66d3783946588ecf43114433 - name: Set up JDK 11 # https://github.com/coursier/setup-action/releases @@ -82,8 +82,8 @@ jobs: - name: Cache Coursier cache # https://github.com/coursier/cache-action/releases - # v6.4.5 - uses: coursier/cache-action@1ff273bff02a8787bc9f1877d347948af647956d + # v7.0.0 + uses: coursier/cache-action@bebeeb0e6f48ebad66d3783946588ecf43114433 - name: Set up JDK 11 # https://github.com/coursier/setup-action/releases diff --git a/.github/workflows/check-samples.yml b/.github/workflows/check-samples.yml index bacb38d3d1a..0d433433d68 100644 --- a/.github/workflows/check-samples.yml +++ b/.github/workflows/check-samples.yml @@ -50,8 +50,8 @@ jobs: - name: Cache Coursier cache # https://github.com/coursier/cache-action/releases - # v6.4.5 - uses: coursier/cache-action@1ff273bff02a8787bc9f1877d347948af647956d + # v7.0.0 + uses: coursier/cache-action@bebeeb0e6f48ebad66d3783946588ecf43114433 - name: Set up JDK 17 # https://github.com/coursier/setup-action/releases diff --git a/.github/workflows/fossa.yml b/.github/workflows/fossa.yml index 31540c0477b..53fde4bbe42 100644 --- a/.github/workflows/fossa.yml +++ b/.github/workflows/fossa.yml @@ -36,8 +36,8 @@ jobs: - name: Cache Coursier cache # https://github.com/coursier/cache-action/releases - # v6.4.5 - uses: coursier/cache-action@1ff273bff02a8787bc9f1877d347948af647956d + # v7.0.0 + uses: coursier/cache-action@bebeeb0e6f48ebad66d3783946588ecf43114433 - name: Set up JDK 17 # https://github.com/coursier/setup-action/releases diff --git a/.github/workflows/link-validator.yml b/.github/workflows/link-validator.yml index cf7c5250da0..eb2ba785082 100644 --- a/.github/workflows/link-validator.yml +++ b/.github/workflows/link-validator.yml @@ -41,8 +41,8 @@ jobs: - name: Cache Coursier cache # https://github.com/coursier/cache-action/releases - # v6.4.5 - uses: coursier/cache-action@1ff273bff02a8787bc9f1877d347948af647956d + # v7.0.0 + uses: coursier/cache-action@bebeeb0e6f48ebad66d3783946588ecf43114433 - name: Set up JDK 11 # https://github.com/coursier/setup-action/releases diff --git a/.github/workflows/multi-node-aeron.yml b/.github/workflows/multi-node-aeron.yml index 09202ae1563..3b60f2273b3 100644 --- a/.github/workflows/multi-node-aeron.yml +++ b/.github/workflows/multi-node-aeron.yml @@ -76,8 +76,8 @@ jobs: - name: Cache Coursier cache # https://github.com/coursier/cache-action/releases - # v6.4.5 - uses: coursier/cache-action@1ff273bff02a8787bc9f1877d347948af647956d + # v7.0.0 + uses: coursier/cache-action@bebeeb0e6f48ebad66d3783946588ecf43114433 - name: Set up JDK 17 # https://github.com/coursier/setup-action/releases diff --git a/.github/workflows/multi-node.yml b/.github/workflows/multi-node.yml index 089eafbdac8..d4b8a886d25 100644 --- a/.github/workflows/multi-node.yml +++ b/.github/workflows/multi-node.yml @@ -76,8 +76,8 @@ jobs: - name: Cache Coursier cache # https://github.com/coursier/cache-action/releases - # v6.4.5 - uses: coursier/cache-action@1ff273bff02a8787bc9f1877d347948af647956d + # v7.0.0 + uses: coursier/cache-action@bebeeb0e6f48ebad66d3783946588ecf43114433 - name: Set up JDK 17 # https://github.com/coursier/setup-action/releases diff --git a/.github/workflows/native-image-tests.yml b/.github/workflows/native-image-tests.yml index 6ba54f67149..feacd8b690f 100644 --- a/.github/workflows/native-image-tests.yml +++ b/.github/workflows/native-image-tests.yml @@ -40,8 +40,8 @@ jobs: - name: Cache Coursier cache # https://github.com/coursier/cache-action/releases - # v6.4.5 - uses: coursier/cache-action@1ff273bff02a8787bc9f1877d347948af647956d + # v7.0.0 + uses: coursier/cache-action@bebeeb0e6f48ebad66d3783946588ecf43114433 - name: Set up JDK 11 # https://github.com/coursier/setup-action/releases diff --git a/.github/workflows/nightly-builds.yml b/.github/workflows/nightly-builds.yml index 30d77048128..fef358875f4 100644 --- a/.github/workflows/nightly-builds.yml +++ b/.github/workflows/nightly-builds.yml @@ -39,8 +39,8 @@ jobs: - name: Cache Coursier cache # https://github.com/coursier/cache-action/releases - # v6.4.5 - uses: coursier/cache-action@1ff273bff02a8787bc9f1877d347948af647956d + # v7.0.0 + uses: coursier/cache-action@bebeeb0e6f48ebad66d3783946588ecf43114433 - name: Set up JDK 11 # https://github.com/coursier/setup-action/releases @@ -134,8 +134,8 @@ jobs: - name: Cache Coursier cache # https://github.com/coursier/cache-action/releases - # v6.4.5 - uses: coursier/cache-action@1ff273bff02a8787bc9f1877d347948af647956d + # v7.0.0 + uses: coursier/cache-action@bebeeb0e6f48ebad66d3783946588ecf43114433 - name: Set up JDK ${{ matrix.jdkVersion }} # https://github.com/coursier/setup-action/releases @@ -247,8 +247,8 @@ jobs: - name: Cache Coursier cache # https://github.com/coursier/cache-action/releases - # v6.4.5 - uses: coursier/cache-action@1ff273bff02a8787bc9f1877d347948af647956d + # v7.0.0 + uses: coursier/cache-action@bebeeb0e6f48ebad66d3783946588ecf43114433 - name: Set up JDK 11 # https://github.com/coursier/setup-action/releases diff --git a/.github/workflows/timing-tests.yml b/.github/workflows/timing-tests.yml index 28d7e876971..0de12aa13e7 100644 --- a/.github/workflows/timing-tests.yml +++ b/.github/workflows/timing-tests.yml @@ -39,8 +39,8 @@ jobs: - name: Cache Coursier cache # https://github.com/coursier/cache-action/releases - # v6.4.5 - uses: coursier/cache-action@1ff273bff02a8787bc9f1877d347948af647956d + # v7.0.0 + uses: coursier/cache-action@bebeeb0e6f48ebad66d3783946588ecf43114433 - name: Set up JDK 11 # https://github.com/coursier/setup-action/releases diff --git a/project/AkkaBuild.scala b/project/AkkaBuild.scala index 3bb1ac79c82..e49bd67a019 100644 --- a/project/AkkaBuild.scala +++ b/project/AkkaBuild.scala @@ -23,7 +23,6 @@ object AkkaBuild { object CliOptions { // CI is the env var defined by Github Actions and Travis: // - https://docs.github.com/en/actions/reference/environment-variables#default-environment-variables - // - https://docs.travis-ci.com/user/environment-variables/#default-environment-variables val runningOnCi: CliOption[Boolean] = CliOption("akka.ci-server", sys.env.contains("CI")) } diff --git a/project/JavaFormatter.scala b/project/JavaFormatter.scala index be926ca151d..cc1cdd0a20e 100644 --- a/project/JavaFormatter.scala +++ b/project/JavaFormatter.scala @@ -2,6 +2,7 @@ * Copyright (C) 2019-2025 Lightbend Inc. */ +import akka.AkkaBuild.CliOptions import akka.ProjectFileIgnoreSupport import com.lightbend.sbt.JavaFormatterPlugin import sbt.{ AutoPlugin, PluginTrigger, Plugins } @@ -15,7 +16,7 @@ object JavaFormatter extends AutoPlugin { private val ignoreConfigFileName: String = ".sbt-java-formatter.conf" private val descriptor: String = "sbt-java-formatter" - private val formatOnCompile = !sys.props.contains("akka.no.discipline") + private val formatOnCompile = !CliOptions.runningOnCi.get && !sys.props.contains("akka.no.discipline") import JavaFormatterPlugin.autoImport._ import sbt.Keys._ diff --git a/project/MiMa.scala b/project/MiMa.scala index 2fcb939edd4..0699d4214d2 100644 --- a/project/MiMa.scala +++ b/project/MiMa.scala @@ -47,16 +47,16 @@ object MiMa extends AutoPlugin { projectName: String, organization: String, scalaBinaryVersion: String): Set[sbt.ModuleID] = { - val akka28Previous = expandVersions(2, 8, firstPatchOf28 to latestPatchOf28) :+ "2.7.1" - val akka29Previous = expandVersions(2, 9, firstPatchOf29 to latestPatchOf29) - val akka210Previous = expandVersions(2, 10, firstPatchOf210 to latestPatchOf210) + val akka28Previous = expandVersions(2, 8, Vector(latestPatchOf28)) :+ "2.7.1" + val akka29Previous = expandVersions(2, 9, Vector(latestPatchOf29)) + val akka210Previous = expandVersions(2, 10, Vector(firstPatchOf210, latestPatchOf210)) val versions: Seq[String] = if (scalaBinaryVersion.startsWith("3")) { // was experimental before 2.7.0 akka28Previous ++ akka29Previous ++ akka210Previous } else { - val akka26Previous = expandVersions(2, 6, firstPatchOf26 to latestPatchOf26) - val akka27Previous = expandVersions(2, 7, firstPatchOf27 to latestPatchOf27) + val akka26Previous = expandVersions(2, 6, Vector(latestPatchOf26)) + val akka27Previous = expandVersions(2, 7, Vector(latestPatchOf27)) akka26Previous ++ akka27Previous ++ akka28Previous ++ akka29Previous }