Skip to content
Open
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
22 changes: 11 additions & 11 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
name: Test
strategy:
matrix:
os: [ubuntu-22.04, macos-latest, windows-2022]
os: [ubuntu-24.04, macos-latest, windows-2022]
scala: [2.12]
java:
- temurin@8
Expand Down Expand Up @@ -196,12 +196,12 @@ jobs:
run: sbt githubWorkflowCheck

- name: Check headers and formatting
if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-22.04'
if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-24.04'
shell: bash
run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' headerCheckAll scalafmtCheckAll 'project /' scalafmtSbtCheck

- name: Check scalafix lints
if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-22.04'
if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-24.04'
shell: bash
run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' 'scalafixAll --check'

Expand All @@ -210,12 +210,12 @@ jobs:
run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' test

- name: Check binary compatibility
if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-22.04'
if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-24.04'
shell: bash
run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' mimaReportBinaryIssues

- name: Generate API documentation
if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-22.04'
if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-24.04'
shell: bash
run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' doc

Expand Down Expand Up @@ -250,7 +250,7 @@ jobs:
if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')
strategy:
matrix:
os: [ubuntu-22.04]
os: [ubuntu-24.04]
java: [temurin@8]
runs-on: ${{ matrix.os }}
timeout-minutes: 45
Expand Down Expand Up @@ -397,7 +397,7 @@ jobs:
if: github.event.repository.fork == false && github.event_name != 'pull_request'
strategy:
matrix:
os: [ubuntu-22.04]
os: [ubuntu-24.04]
java: [temurin@8]
runs-on: ${{ matrix.os }}
steps:
Expand Down Expand Up @@ -514,7 +514,7 @@ jobs:
name: Validate Steward Config
strategy:
matrix:
os: [ubuntu-22.04]
os: [ubuntu-24.04]
java: [temurin@17]
runs-on: ${{ matrix.os }}
steps:
Expand All @@ -539,7 +539,7 @@ jobs:
name: Generate Site
strategy:
matrix:
os: [ubuntu-22.04]
os: [ubuntu-24.04]
java: [temurin@11]
runs-on: ${{ matrix.os }}
steps:
Expand Down Expand Up @@ -661,7 +661,7 @@ jobs:
name: Generate some output
strategy:
matrix:
os: [ubuntu-22.04]
os: [ubuntu-24.04]
runs-on: ${{ matrix.os }}
outputs:
greeting: ${{ steps.greet.outputs.msg }}
Expand All @@ -675,7 +675,7 @@ jobs:
if: ${{ needs.greeter.outputs.greeting != 'Hello' }}
strategy:
matrix:
os: [ubuntu-22.04]
os: [ubuntu-24.04]
runs-on: ${{ matrix.os }}
steps:
- run: exit 1
18 changes: 9 additions & 9 deletions .mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,17 @@ pull_request_rules:
- or:
- body~=labels:.*early-semver-patch
- body~=labels:.*early-semver-minor
- status-success=Test (ubuntu-22.04, 2.12, temurin@8, sbt-typelevelJVM)
- status-success=Test (ubuntu-22.04, 2.12, temurin@11, sbt-typelevelJVM)
- status-success=Test (ubuntu-22.04, 2.12, temurin@17, sbt-typelevelJVM)
- status-success=Test (ubuntu-22.04, 2.12, graal_22.3.2@11, sbt-typelevelJVM)
- status-success=Test (ubuntu-22.04, 2.12, graalvm@21, sbt-typelevelJVM)
- status-success=Test (ubuntu-22.04, 2.12, corretto@17, sbt-typelevelJVM)
- status-success=Test (ubuntu-22.04, 2.12, semeru@17, sbt-typelevelJVM)
- status-success=Test (ubuntu-24.04, 2.12, temurin@8, sbt-typelevelJVM)
- status-success=Test (ubuntu-24.04, 2.12, temurin@11, sbt-typelevelJVM)
- status-success=Test (ubuntu-24.04, 2.12, temurin@17, sbt-typelevelJVM)
- status-success=Test (ubuntu-24.04, 2.12, graal_22.3.2@11, sbt-typelevelJVM)
- status-success=Test (ubuntu-24.04, 2.12, graalvm@21, sbt-typelevelJVM)
- status-success=Test (ubuntu-24.04, 2.12, corretto@17, sbt-typelevelJVM)
- status-success=Test (ubuntu-24.04, 2.12, semeru@17, sbt-typelevelJVM)
- status-success=Test (macos-latest, 2.12, temurin@17, sbt-typelevelJVM)
- status-success=Test (windows-2022, 2.12, temurin@8, sbt-typelevelJVM)
- status-success=Validate Steward Config (ubuntu-22.04, temurin@17)
- status-success=Generate Site (ubuntu-22.04, temurin@11)
- status-success=Validate Steward Config (ubuntu-24.04, temurin@17)
- status-success=Generate Site (ubuntu-24.04, temurin@11)
- '#approved-reviews-by>=1'
actions:
merge: {}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ trait GenerativeKeys {
lazy val githubWorkflowScalaVersions = settingKey[Seq[String]](
"A list of Scala versions on which to build the project (default: crossScalaVersions.value)")
lazy val githubWorkflowOSes =
settingKey[Seq[String]]("A list of OS names (default: [ubuntu-22.04])")
settingKey[Seq[String]]("A list of OS names (default: [ubuntu-24.04])")

lazy val githubWorkflowDependencyPatterns = settingKey[Seq[String]](
"A list of file globes within the project which affect dependency information (default: [**/*.sbt, project/build.properties])")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -689,7 +689,7 @@ ${indent(jobs.map(compileJob(_, sbt)).mkString("\n\n"), 1)}
else
scalas
},
githubWorkflowOSes := Seq("ubuntu-22.04"),
githubWorkflowOSes := Seq("ubuntu-24.04"),
githubWorkflowDependencyPatterns := Seq("**/*.sbt", "project/build.properties"),
githubWorkflowTargetBranches := Seq("**"),
githubWorkflowTargetTags := Seq(),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ object WorkflowJob {
cond: Option[String] = None,
permissions: Option[Permissions] = None,
env: Map[String, String] = Map(),
oses: List[String] = List("ubuntu-22.04"),
oses: List[String] = List("ubuntu-24.04"),
scalas: List[String] = List("2.13"),
javas: List[JavaSpec] = List(JavaSpec.temurin("11")),
needs: List[String] = List(),
Expand Down
Loading