diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9025fa77..507dea97 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -484,11 +484,25 @@ jobs: strategy: matrix: os: [ubuntu-latest] + java: [temurin@11] runs-on: ${{ matrix.os }} steps: - name: Checkout current branch (fast) uses: actions/checkout@v3 + - name: Setup Java (temurin@11) + id: setup-java-temurin-11 + if: matrix.java == 'temurin@11' + uses: actions/setup-java@v3 + with: + distribution: temurin + java-version: 11 + cache: sbt + + - name: sbt update + if: matrix.java == 'temurin@11' && steps.setup-java-temurin-11.outputs.cache-hit == 'false' + run: sbt '++ ${{ matrix.scala }}' reload +update + - uses: coursier/setup-action@v1 with: apps: scala-steward diff --git a/.mergify.yml b/.mergify.yml index 1a48bc1d..258627d1 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -21,7 +21,7 @@ pull_request_rules: - status-success=Build and Test (ubuntu-latest, 2.12, semeru@17, sbt-typelevelJVM) - status-success=Build and Test (macos-latest, 2.12, temurin@8, sbt-typelevelJVM) - status-success=Build and Test (windows-latest, 2.12, temurin@8, sbt-typelevelJVM) - - status-success=Validate Steward Config (ubuntu-latest) + - status-success=Validate Steward Config (ubuntu-latest, temurin@11) - status-success=Generate Site (ubuntu-latest, temurin@8) - '#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 ad553a5d..c1e4ba05 100644 --- a/ci/src/main/scala/org/typelevel/sbt/TypelevelCiPlugin.scala +++ b/ci/src/main/scala/org/typelevel/sbt/TypelevelCiPlugin.scala @@ -169,13 +169,13 @@ object TypelevelCiPlugin extends AutoPlugin { "validate-steward", "Validate Steward Config", WorkflowStep.Checkout :: + WorkflowStep.SetupJava(List(JavaSpec.temurin("11"))) ::: 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, - javas = List.empty + scalas = List.empty ) } }