Skip to content
Merged
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
10 changes: 5 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
5 changes: 3 additions & 2 deletions ci/src/main/scala/org/typelevel/sbt/TypelevelCiPlugin.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
)
}
}
Expand Down
Loading