From 9f4101f33b286b9d7d8f2c3c917f0b4082ebcab2 Mon Sep 17 00:00:00 2001 From: xuwei-k <6b656e6a69@gmail.com> Date: Mon, 13 Jul 2026 06:52:27 +0900 Subject: [PATCH] Update validate-steward job java version --- .github/workflows/ci.yml | 10 +++++----- .mergify.yml | 2 +- .../scala/org/typelevel/sbt/TypelevelCiPlugin.scala | 5 +++-- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 631d1088..2104f839 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -515,19 +515,19 @@ jobs: strategy: matrix: os: [ubuntu-22.04] - java: [temurin@11] + java: [temurin@17] runs-on: ${{ matrix.os }} steps: - name: Checkout current branch (fast) uses: actions/checkout@v6 - - name: Setup Java (temurin@11) - id: setup-java-temurin-11 - if: matrix.java == 'temurin@11' + - name: Setup Java (temurin@17) + id: setup-java-temurin-17 + if: matrix.java == 'temurin@17' uses: actions/setup-java@v5 with: distribution: temurin - java-version: 11 + java-version: 17 - uses: coursier/setup-action@v1 with: diff --git a/.mergify.yml b/.mergify.yml index e74eb694..3ccf6447 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -21,7 +21,7 @@ pull_request_rules: - status-success=Test (ubuntu-22.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@11) + - status-success=Validate Steward Config (ubuntu-22.04, temurin@17) - status-success=Generate Site (ubuntu-22.04, temurin@11) - '#approved-reviews-by>=1' actions: diff --git a/ci/src/main/scala/org/typelevel/sbt/TypelevelCiPlugin.scala b/ci/src/main/scala/org/typelevel/sbt/TypelevelCiPlugin.scala index 877fa5f3..f31b9f90 100644 --- a/ci/src/main/scala/org/typelevel/sbt/TypelevelCiPlugin.scala +++ b/ci/src/main/scala/org/typelevel/sbt/TypelevelCiPlugin.scala @@ -177,13 +177,14 @@ object TypelevelCiPlugin extends AutoPlugin { "validate-steward", "Validate Steward Config", WorkflowStep.Checkout :: - WorkflowStep.SetupJava(List(JavaSpec.temurin("11")), false) ::: + WorkflowStep.SetupJava(List(JavaSpec.temurin("17")), false) ::: WorkflowStep.Use( UseRef.Public("coursier", "setup-action", "v1"), Map("apps" -> "scala-steward") ) :: WorkflowStep.Run(List(s"scala-steward validate-repo-config $config")) :: Nil, - scalas = List.empty + scalas = List.empty, + javas = List(JavaSpec.temurin("17")) ) } }