From 0909adaf0e97bcb3d7af0f1b9602641528584a00 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Fri, 28 Aug 2026 14:03:01 -0400 Subject: [PATCH] Use setup-java v6 --- .github/workflows/ci.yml | 8 ++++---- src/main/scala/sbtghactions/WorkflowStep.scala | 2 +- .../allow-hashes/.github/workflows/ci-modified.yml | 4 ++-- .../sbtghactions/allow-hashes/.github/workflows/ci.yml | 4 ++-- .../sbtghactions/check-and-regenerate/expected-ci.yml | 4 ++-- .../.github/workflows/ci.yml | 4 ++-- .../sbtghactions/no-clean/.github/workflows/ci.yml | 4 ++-- .../non-existent-target/.github/workflows/ci.yml | 4 ++-- .../sbt-native-thin-client/.github/workflows/ci.yml | 4 ++-- .../sbtghactions/suppressed-scala-version/expected-ci.yml | 4 ++-- src/test/scala/sbtghactions/GenerativePluginSpec.scala | 2 +- 11 files changed, 22 insertions(+), 22 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b114961..dbf4bcc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -47,7 +47,7 @@ jobs: - name: Setup Java (corretto@17) if: matrix.java == 'corretto@17' - uses: actions/setup-java@v5 + uses: actions/setup-java@v6 with: distribution: corretto java-version: 17 @@ -55,7 +55,7 @@ jobs: - name: Setup Java (zulu@8) if: matrix.java == 'zulu@8' - uses: actions/setup-java@v5 + uses: actions/setup-java@v6 with: distribution: zulu java-version: 8 @@ -120,7 +120,7 @@ jobs: - name: Setup Java (corretto@17) if: matrix.java == 'corretto@17' - uses: actions/setup-java@v5 + uses: actions/setup-java@v6 with: distribution: corretto java-version: 17 @@ -128,7 +128,7 @@ jobs: - name: Setup Java (zulu@8) if: matrix.java == 'zulu@8' - uses: actions/setup-java@v5 + uses: actions/setup-java@v6 with: distribution: zulu java-version: 8 diff --git a/src/main/scala/sbtghactions/WorkflowStep.scala b/src/main/scala/sbtghactions/WorkflowStep.scala index 4f830e8..1163dc4 100644 --- a/src/main/scala/sbtghactions/WorkflowStep.scala +++ b/src/main/scala/sbtghactions/WorkflowStep.scala @@ -31,7 +31,7 @@ sealed trait WorkflowStep extends Product with Serializable { object Action { val checkout = UseRef.Public("actions", "checkout", "v7") val setupGraalvm = UseRef.Public("graalvm", "setup-graalvm", "v1") - val setupJava = UseRef.Public("actions", "setup-java", "v5") + val setupJava = UseRef.Public("actions", "setup-java", "v6") val setupSbt = UseRef.Public("sbt", "setup-sbt", "v1") val tmate = UseRef.Public("mxschmitt", "action-tmate", "v2") val upload = UseRef.Public("actions", "upload-artifact", "v7") diff --git a/src/sbt-test/sbtghactions/allow-hashes/.github/workflows/ci-modified.yml b/src/sbt-test/sbtghactions/allow-hashes/.github/workflows/ci-modified.yml index 1493777..eceba7f 100644 --- a/src/sbt-test/sbtghactions/allow-hashes/.github/workflows/ci-modified.yml +++ b/src/sbt-test/sbtghactions/allow-hashes/.github/workflows/ci-modified.yml @@ -36,7 +36,7 @@ jobs: - name: Setup Java (zulu@8) if: matrix.java == 'zulu@8' - uses: actions/setup-java@v5 + uses: actions/setup-java@v6 with: distribution: zulu java-version: 8 @@ -78,7 +78,7 @@ jobs: - name: Setup Java (zulu@8) if: matrix.java == 'zulu@8' - uses: actions/setup-java@v5 + uses: actions/setup-java@v6 with: distribution: zulu java-version: 8 diff --git a/src/sbt-test/sbtghactions/allow-hashes/.github/workflows/ci.yml b/src/sbt-test/sbtghactions/allow-hashes/.github/workflows/ci.yml index 2a33685..75b3333 100644 --- a/src/sbt-test/sbtghactions/allow-hashes/.github/workflows/ci.yml +++ b/src/sbt-test/sbtghactions/allow-hashes/.github/workflows/ci.yml @@ -33,7 +33,7 @@ jobs: - name: Setup Java (zulu@8) if: matrix.java == 'zulu@8' - uses: actions/setup-java@v5 + uses: actions/setup-java@v6 with: distribution: zulu java-version: 8 @@ -75,7 +75,7 @@ jobs: - name: Setup Java (zulu@8) if: matrix.java == 'zulu@8' - uses: actions/setup-java@v5 + uses: actions/setup-java@v6 with: distribution: zulu java-version: 8 diff --git a/src/sbt-test/sbtghactions/check-and-regenerate/expected-ci.yml b/src/sbt-test/sbtghactions/check-and-regenerate/expected-ci.yml index 912a24f..30adc54 100644 --- a/src/sbt-test/sbtghactions/check-and-regenerate/expected-ci.yml +++ b/src/sbt-test/sbtghactions/check-and-regenerate/expected-ci.yml @@ -43,7 +43,7 @@ jobs: - name: Setup Java (zulu@8) if: matrix.java == 'zulu@8' - uses: actions/setup-java@v5 + uses: actions/setup-java@v6 with: distribution: zulu java-version: 8 @@ -99,7 +99,7 @@ jobs: - name: Setup Java (zulu@8) if: matrix.java == 'zulu@8' - uses: actions/setup-java@v5 + uses: actions/setup-java@v6 with: distribution: zulu java-version: 8 diff --git a/src/sbt-test/sbtghactions/githubworkflowoses-clean-publish/.github/workflows/ci.yml b/src/sbt-test/sbtghactions/githubworkflowoses-clean-publish/.github/workflows/ci.yml index 7a5bf4d..ebe8bcb 100644 --- a/src/sbt-test/sbtghactions/githubworkflowoses-clean-publish/.github/workflows/ci.yml +++ b/src/sbt-test/sbtghactions/githubworkflowoses-clean-publish/.github/workflows/ci.yml @@ -46,7 +46,7 @@ jobs: - name: Setup Java (zulu@8) if: matrix.java == 'zulu@8' - uses: actions/setup-java@v5 + uses: actions/setup-java@v6 with: distribution: zulu java-version: 8 @@ -104,7 +104,7 @@ jobs: - name: Setup Java (zulu@8) if: matrix.java == 'zulu@8' - uses: actions/setup-java@v5 + uses: actions/setup-java@v6 with: distribution: zulu java-version: 8 diff --git a/src/sbt-test/sbtghactions/no-clean/.github/workflows/ci.yml b/src/sbt-test/sbtghactions/no-clean/.github/workflows/ci.yml index f710c63..116336d 100644 --- a/src/sbt-test/sbtghactions/no-clean/.github/workflows/ci.yml +++ b/src/sbt-test/sbtghactions/no-clean/.github/workflows/ci.yml @@ -33,7 +33,7 @@ jobs: - name: Setup Java (zulu@8) if: matrix.java == 'zulu@8' - uses: actions/setup-java@v5 + uses: actions/setup-java@v6 with: distribution: zulu java-version: 8 @@ -75,7 +75,7 @@ jobs: - name: Setup Java (zulu@8) if: matrix.java == 'zulu@8' - uses: actions/setup-java@v5 + uses: actions/setup-java@v6 with: distribution: zulu java-version: 8 diff --git a/src/sbt-test/sbtghactions/non-existent-target/.github/workflows/ci.yml b/src/sbt-test/sbtghactions/non-existent-target/.github/workflows/ci.yml index b824e59..4901f8c 100644 --- a/src/sbt-test/sbtghactions/non-existent-target/.github/workflows/ci.yml +++ b/src/sbt-test/sbtghactions/non-existent-target/.github/workflows/ci.yml @@ -33,7 +33,7 @@ jobs: - name: Setup Java (zulu@8) if: matrix.java == 'zulu@8' - uses: actions/setup-java@v5 + uses: actions/setup-java@v6 with: distribution: zulu java-version: 8 @@ -74,7 +74,7 @@ jobs: - name: Setup Java (zulu@8) if: matrix.java == 'zulu@8' - uses: actions/setup-java@v5 + uses: actions/setup-java@v6 with: distribution: zulu java-version: 8 diff --git a/src/sbt-test/sbtghactions/sbt-native-thin-client/.github/workflows/ci.yml b/src/sbt-test/sbtghactions/sbt-native-thin-client/.github/workflows/ci.yml index 33c9198..5a2d302 100644 --- a/src/sbt-test/sbtghactions/sbt-native-thin-client/.github/workflows/ci.yml +++ b/src/sbt-test/sbtghactions/sbt-native-thin-client/.github/workflows/ci.yml @@ -33,7 +33,7 @@ jobs: - name: Setup Java (zulu@8) if: matrix.java == 'zulu@8' - uses: actions/setup-java@v5 + uses: actions/setup-java@v6 with: distribution: zulu java-version: 8 @@ -91,7 +91,7 @@ jobs: - name: Setup Java (zulu@8) if: matrix.java == 'zulu@8' - uses: actions/setup-java@v5 + uses: actions/setup-java@v6 with: distribution: zulu java-version: 8 diff --git a/src/sbt-test/sbtghactions/suppressed-scala-version/expected-ci.yml b/src/sbt-test/sbtghactions/suppressed-scala-version/expected-ci.yml index ce2846e..e329d37 100644 --- a/src/sbt-test/sbtghactions/suppressed-scala-version/expected-ci.yml +++ b/src/sbt-test/sbtghactions/suppressed-scala-version/expected-ci.yml @@ -34,7 +34,7 @@ jobs: - name: Setup Java (zulu@8) if: matrix.java == 'zulu@8' - uses: actions/setup-java@v5 + uses: actions/setup-java@v6 with: distribution: zulu java-version: 8 @@ -76,7 +76,7 @@ jobs: - name: Setup Java (zulu@8) if: matrix.java == 'zulu@8' - uses: actions/setup-java@v5 + uses: actions/setup-java@v6 with: distribution: zulu java-version: 8 diff --git a/src/test/scala/sbtghactions/GenerativePluginSpec.scala b/src/test/scala/sbtghactions/GenerativePluginSpec.scala index 7da656b..a08c2f3 100644 --- a/src/test/scala/sbtghactions/GenerativePluginSpec.scala +++ b/src/test/scala/sbtghactions/GenerativePluginSpec.scala @@ -616,7 +616,7 @@ class GenerativePluginSpec extends Specification { steps: - name: Setup Java (temurin@17) if: matrix.java == 'temurin@17' - uses: actions/setup-java@v5 + uses: actions/setup-java@v6 with: distribution: temurin java-version: 17