Use githubWorkflowJobSetup in scala-steward job

typelevel · Jul 16, 2023 · b084018 · b084018
1 parent e974029
commit b084018
Show file tree

Hide file tree

Showing 2 changed files with 89 additions and 7 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -501,8 +501,27 @@ jobs:
         java: [temurin@11]
     runs-on: ${{ matrix.os }}
     steps:
-      - name: Checkout current branch (fast)
+      - name: Ignore line ending differences in git
+        if: contains(runner.os, 'windows')
+        run: git config --global core.autocrlf false
+
+      - name: Checkout current branch (full)
         uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: Setup Java (temurin@8)
+        id: setup-java-temurin-8
+        if: matrix.java == 'temurin@8'
+        uses: actions/setup-java@v3
+        with:
+          distribution: temurin
+          java-version: 8
+          cache: sbt
+
+      - name: sbt update
+        if: matrix.java == 'temurin@8' && steps.setup-java-temurin-8.outputs.cache-hit == 'false'
+        run: sbt '++ ${{ matrix.scala }}' reload +update
 
       - name: Setup Java (temurin@11)
         id: setup-java-temurin-11
@@ -517,6 +536,71 @@ jobs:
         if: matrix.java == 'temurin@11' && steps.setup-java-temurin-11.outputs.cache-hit == 'false'
         run: sbt '++ ${{ matrix.scala }}' reload +update
 
+      - name: Setup Java (temurin@17)
+        id: setup-java-temurin-17
+        if: matrix.java == 'temurin@17'
+        uses: actions/setup-java@v3
+        with:
+          distribution: temurin
+          java-version: 17
+          cache: sbt
+
+      - name: sbt update
+        if: matrix.java == 'temurin@17' && steps.setup-java-temurin-17.outputs.cache-hit == 'false'
+        run: sbt '++ ${{ matrix.scala }}' reload +update
+
+      - name: Setup GraalVM (graal_22.3.2@11)
+        id: setup-graalvm-22_3_2-11
+        if: matrix.java == 'graal_22.3.2@11'
+        uses: graalvm/setup-graalvm@v1
+        with:
+          version: 22.3.2
+          java-version: 11
+          cache: sbt
+
+      - name: sbt update
+        if: matrix.java == 'graal_22.3.2@11' && steps.setup-graalvm-22_3_2-11.outputs.cache-hit == 'false'
+        run: sbt '++ ${{ matrix.scala }}' reload +update
+
+      - name: Setup Java (graalvm@17)
+        id: setup-java-graalvm-17
+        if: matrix.java == 'graalvm@17'
+        uses: graalvm/setup-graalvm@v1
+        with:
+          distribution: graalvm
+          java-version: 17
+          cache: sbt
+
+      - name: sbt update
+        if: matrix.java == 'graalvm@17' && steps.setup-java-graalvm-17.outputs.cache-hit == 'false'
+        run: sbt '++ ${{ matrix.scala }}' reload +update
+
+      - name: Setup Java (corretto@17)
+        id: setup-java-corretto-17
+        if: matrix.java == 'corretto@17'
+        uses: actions/setup-java@v3
+        with:
+          distribution: corretto
+          java-version: 17
+          cache: sbt
+
+      - name: sbt update
+        if: matrix.java == 'corretto@17' && steps.setup-java-corretto-17.outputs.cache-hit == 'false'
+        run: sbt '++ ${{ matrix.scala }}' reload +update
+
+      - name: Setup Java (semeru@17)
+        id: setup-java-semeru-17
+        if: matrix.java == 'semeru@17'
+        uses: actions/setup-java@v3
+        with:
+          distribution: semeru
+          java-version: 17
+          cache: sbt
+
+      - name: sbt update
+        if: matrix.java == 'semeru@17' && steps.setup-java-semeru-17.outputs.cache-hit == 'false'
+        run: sbt '++ ${{ matrix.scala }}' reload +update
+
       - uses: coursier/setup-action@v1
         with:
           apps: scala-steward

diff --git a/ci/src/main/scala/org/typelevel/sbt/TypelevelCiPlugin.scala b/ci/src/main/scala/org/typelevel/sbt/TypelevelCiPlugin.scala
@@ -168,12 +168,10 @@ object TypelevelCiPlugin extends AutoPlugin {
           WorkflowJob(
             "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")
-              ) ::
+            githubWorkflowJobSetup.value.toList ::: 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
           )