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
12 changes: 6 additions & 6 deletions .github/workflows/binary-compatibility-checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |-
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/build-test-prValidation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/check-samples.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/fossa.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/link-validator.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/multi-node-aeron.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/multi-node.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/native-image-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/nightly-builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/timing-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion project/AkkaBuild.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
}

Expand Down
3 changes: 2 additions & 1 deletion project/JavaFormatter.scala
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
* Copyright (C) 2019-2025 Lightbend Inc. <https://www.lightbend.com>
*/

import akka.AkkaBuild.CliOptions
import akka.ProjectFileIgnoreSupport
import com.lightbend.sbt.JavaFormatterPlugin
import sbt.{ AutoPlugin, PluginTrigger, Plugins }
Expand All @@ -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._
Expand Down
10 changes: 5 additions & 5 deletions project/MiMa.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down