From cdcfa928f184f1feb2978a9e7a08457e5c697850 Mon Sep 17 00:00:00 2001 From: xuwei-k <6b656e6a69@gmail.com> Date: Fri, 24 Jul 2026 16:54:01 +0900 Subject: [PATCH] Update to ubuntu-24.04 --- .github/workflows/ci.yml | 22 +++++++++---------- .mergify.yml | 18 +++++++-------- .../typelevel/sbt/gha/GenerativeKeys.scala | 2 +- .../typelevel/sbt/gha/GenerativePlugin.scala | 2 +- .../org/typelevel/sbt/gha/WorkflowJob.scala | 2 +- 5 files changed, 23 insertions(+), 23 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2104f839..0ab2bf1f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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 @@ -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' @@ -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 @@ -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 @@ -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: @@ -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: @@ -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: @@ -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 }} @@ -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 diff --git a/.mergify.yml b/.mergify.yml index 3ccf6447..76c4d320 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -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: {} diff --git a/github-actions/src/main/scala/org/typelevel/sbt/gha/GenerativeKeys.scala b/github-actions/src/main/scala/org/typelevel/sbt/gha/GenerativeKeys.scala index 3ddcfc3d..cb137449 100644 --- a/github-actions/src/main/scala/org/typelevel/sbt/gha/GenerativeKeys.scala +++ b/github-actions/src/main/scala/org/typelevel/sbt/gha/GenerativeKeys.scala @@ -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])") diff --git a/github-actions/src/main/scala/org/typelevel/sbt/gha/GenerativePlugin.scala b/github-actions/src/main/scala/org/typelevel/sbt/gha/GenerativePlugin.scala index 0ef9ff3d..e36c693a 100644 --- a/github-actions/src/main/scala/org/typelevel/sbt/gha/GenerativePlugin.scala +++ b/github-actions/src/main/scala/org/typelevel/sbt/gha/GenerativePlugin.scala @@ -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(), diff --git a/github-actions/src/main/scala/org/typelevel/sbt/gha/WorkflowJob.scala b/github-actions/src/main/scala/org/typelevel/sbt/gha/WorkflowJob.scala index 61d167b6..506b2cbf 100644 --- a/github-actions/src/main/scala/org/typelevel/sbt/gha/WorkflowJob.scala +++ b/github-actions/src/main/scala/org/typelevel/sbt/gha/WorkflowJob.scala @@ -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(),