Merge pull request #508 from armanbilge/fix/validate-steward-java

Steward config validation job can use default Java
typelevel · May 12, 2023 · 2aa235c · 2aa235c
2 parents 896088a + 6df5891
commit 2aa235c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 20 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -207,28 +207,11 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        java: [temurin@11]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout current branch (fast)
         uses: actions/checkout@v3
 
-      - name: Download Java (temurin@17)
-        id: download-java-temurin-17
-        if: matrix.java == 'temurin@17'
-        uses: typelevel/download-java@v2
-        with:
-          distribution: temurin
-          java-version: 17
-
-      - name: Setup Java (temurin@17)
-        if: matrix.java == 'temurin@17'
-        uses: actions/setup-java@v3
-        with:
-          distribution: jdkfile
-          java-version: 17
-          jdkFile: ${{ steps.download-java-temurin-17.outputs.jdkFile }}
-
       - uses: coursier/setup-action@v1
         with:
           apps: scala-steward

diff --git a/.mergify.yml b/.mergify.yml
@@ -14,7 +14,7 @@ pull_request_rules:
     - body~=labels:.*early-semver-minor
   - status-success=Build and Test (ubuntu-latest, 2.12.17, temurin@8, rootJVM)
   - status-success=Build and Test (ubuntu-latest, 2.12.17, temurin@17, rootJVM)
-  - status-success=Validate Steward Config (ubuntu-latest, temurin@11)
+  - status-success=Validate Steward Config (ubuntu-latest)
   - 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
@@ -139,13 +139,13 @@ object TypelevelCiPlugin extends AutoPlugin {
             "validate-steward",
             "Validate Steward Config",
             WorkflowStep.Checkout ::
-              WorkflowStep.SetupJava(List(JavaSpec.temurin("17"))) :::
               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.empty
           )
         }
     }