From e46c4a2a35bb6d11e7be38170982972c52983a76 Mon Sep 17 00:00:00 2001 From: xuwei-k <6b656e6a69@gmail.com> Date: Tue, 14 Jul 2026 17:39:41 +0900 Subject: [PATCH] Update sbt-typelevel. Restore validate-steward job --- .github/workflows/ci.yml | 25 +++++++++++++++++++++++++ build.sbt | 4 ---- project/plugins.sbt | 2 +- 3 files changed, 26 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c7c178770..241181ed4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -299,3 +299,28 @@ jobs: with: modules-ignore: monocle-test_2.13 monocle-test_3 monocle-test_native0.5_2.13 monocle-test_native0.5_3 rootjs_2.13 rootjs_3 monocle-docs_2.13 rootjvm_2.13 rootjvm_3 rootnative_2.13 rootnative_3 monocle-test_sjs1_2.13 monocle-test_sjs1_3 monocle-example_2.13 monocle-example_3 monocle-bench_2.13 monocle-bench_3 configs-ignore: test scala-tool scala-doc-tool test-internal + + validate-steward: + name: Validate Steward Config + strategy: + matrix: + os: [ubuntu-22.04] + java: [temurin@17] + runs-on: ${{ matrix.os }} + steps: + - name: Checkout current branch (fast) + uses: actions/checkout@v6 + + - 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: 17 + + - uses: coursier/setup-action@v1 + with: + apps: scala-steward + + - run: scala-steward validate-repo-config .scala-steward.conf diff --git a/build.sbt b/build.sbt index b281ef944..cca453e6f 100644 --- a/build.sbt +++ b/build.sbt @@ -27,10 +27,6 @@ inThisBuild( name = Some("Run documentation"), cond = Some(s"matrix.scala == '2.13' && matrix.project == 'rootJVM'") ), - githubWorkflowAddedJobs ~= ( - // https://github.com/typelevel/sbt-typelevel/issues/904 - _.filter(_.id != "validate-steward") - ), githubWorkflowJavaVersions := Seq( JavaSpec.temurin("11"), JavaSpec.temurin("25") diff --git a/project/plugins.sbt b/project/plugins.sbt index 37025a403..4c94f5046 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,4 @@ -addSbtPlugin("org.typelevel" % "sbt-typelevel-ci-release" % "0.8.6") +addSbtPlugin("org.typelevel" % "sbt-typelevel-ci-release" % "0.8.7") addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.13.1") addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.8")