Skip to content

Commit

Permalink
Merge pull request #611 from etspaceman/javaVersion
Browse files Browse the repository at this point in the history
Revert #508
  • Loading branch information
armanbilge authored Jul 16, 2023
2 parents 20a18ae + c51c731 commit 2a8780b
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 3 deletions.
14 changes: 14 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
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=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:
Expand Down
4 changes: 2 additions & 2 deletions ci/src/main/scala/org/typelevel/sbt/TypelevelCiPlugin.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
}
}
Expand Down

0 comments on commit 2a8780b

Please sign in to comment.