Update examples.yaml

confused how this made it past CI?

Signed-off-by: Appu <[email protected]>

Author: loosebazooka

.github/workflows/examples.yaml

@@ -10,7 +10,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, macos-latest] # TODO: add back in windows-latest after new release (v1.3.0 broken on windows)
+        os: [ubuntu-latest, macos-latest, windows-latest]
     name: Build and run release examples on ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     concurrency:
@@ -79,8 +79,8 @@ jobs:
       uses: gradle/actions/setup-gradle@748248ddd2a24f49513d8f472f81c3a07d4d50e1 # v4.4.4
 
     - name: install sigstore java development jars into mavenLocal
-      run: ./gradlew publishToMavenLocal -Prelease -PskipSigning -Porg.gradle.java.installations.auto-download=false
-s
+      run: ./gradlew publishToMavenLocal -Prelease -PskipSigning "-Porg.gradle.java.installations.auto-download=false"
+
     - name: calculate development version
       id: dev_version
       shell: bash

sigstore-testkit/src/main/kotlin/dev/sigstore/testkit/BaseGradleTest.kt

@@ -23,11 +23,8 @@ import org.gradle.testkit.runner.GradleRunner
 import org.gradle.testkit.runner.internal.DefaultGradleRunner
 import org.gradle.util.GradleVersion
 import org.intellij.lang.annotations.Language
-import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.io.CleanupMode
 import org.junit.jupiter.api.io.TempDir
-import org.junit.jupiter.params.provider.Arguments
-import org.junit.jupiter.params.provider.Arguments.arguments
 import java.io.File
 import java.nio.file.Path
 import kotlin.io.path.appendText
@@ -36,6 +33,7 @@ open class BaseGradleTest {
     enum class ConfigurationCache {
         ON, OFF
     }
+
     enum class ProjectIsolation {
         ON, OFF
     }
@@ -44,12 +42,17 @@ open class BaseGradleTest {
     protected val gradleRunner = GradleRunner
         .create()
         .withPluginClasspath()
-        .withEnvironment(mapOf("JAVA_HOME" to TEST_JAVA_HOME))
+        .apply {
+            val env = environment!!.toMutableMap()
+            env["JAVA_HOME"] = TEST_JAVA_HOME
+            withEnvironment(env)
+        }
 
     companion object {
         val isCI = System.getenv().containsKey("CI") || System.getProperties().containsKey("CI")
 
-        val EXTRA_LOCAL_REPOS  = System.getProperty("sigstore.test.local.maven.repo").split(File.pathSeparatorChar)
+        val EXTRA_LOCAL_REPOS =
+            System.getProperty("sigstore.test.local.maven.repo").split(File.pathSeparatorChar)
 
         val TEST_JAVA_HOME = System.getProperty("sigstore-java.test.JAVA_HOME")
 
@@ -74,25 +77,52 @@ open class BaseGradleTest {
         ).map { GradleVersion.version(it) }
             .filter {
                 // See https://docs.gradle.org/current/userguide/compatibility.html
-                JavaVersion.current() <= JavaVersion.VERSION_21 && it <= GradleVersion.version("8.4") ||
-                    JavaVersion.current() <= JavaVersion.VERSION_25 && it <= GradleVersion.version("9.1.0")
+                JavaVersion.current() < JavaVersion.VERSION_21 ||
+                        JavaVersion.current() >= JavaVersion.VERSION_21 && it >= GradleVersion.version(
+                    "8.4"
+                ) ||
+                        JavaVersion.current() >= JavaVersion.VERSION_25 && it >= GradleVersion.version(
+                    "9.1.0"
+                )
             }
 
         @JvmStatic
         fun gradleVersionAndSettings(): Iterable<TestedGradle> {
             if (!isCI) {
                 // Execute a single combination only when running locally
                 return listOf(
-                    TestedGradle(gradleVersions().first(), ConfigurationCache.ON, ProjectIsolation.ON)
+                    TestedGradle(
+                        gradleVersions().first(),
+                        ConfigurationCache.ON,
+                        ProjectIsolation.ON
+                    )
                 )
             }
             return buildList {
                 addAll(
-                    gradleVersions().map { TestedGradle(it, ConfigurationCache.ON, ProjectIsolation.ON) }
+                    gradleVersions().map {
+                        TestedGradle(
+                            it,
+                            ConfigurationCache.ON,
+                            ProjectIsolation.ON
+                        )
+                    }
                 )
                 // Test the first and the last version without configuration cache
-                add(TestedGradle(gradleVersions().first(), ConfigurationCache.OFF, ProjectIsolation.OFF))
-                add(TestedGradle(gradleVersions().last(), ConfigurationCache.OFF, ProjectIsolation.OFF))
+                add(
+                    TestedGradle(
+                        gradleVersions().first(),
+                        ConfigurationCache.OFF,
+                        ProjectIsolation.OFF
+                    )
+                )
+                add(
+                    TestedGradle(
+                        gradleVersions().last(),
+                        ConfigurationCache.OFF,
+                        ProjectIsolation.OFF
+                    )
+                )
             }
         }
 
@@ -125,8 +155,11 @@ open class BaseGradleTest {
     fun Path.write(text: String) = this.toFile().writeText(text)
     fun Path.read(): String = this.toFile().readText()
 
-    fun writeBuildGradle(@Language("Groovy") text: String) = projectDir.resolve("build.gradle").write(text)
-    fun writeSettingsGradle(@Language("Groovy") text: String) = projectDir.resolve("settings.gradle").write(text)
+    fun writeBuildGradle(@Language("Groovy") text: String) =
+        projectDir.resolve("build.gradle").write(text)
+
+    fun writeSettingsGradle(@Language("Groovy") text: String) =
+        projectDir.resolve("settings.gradle").write(text)
 
     protected fun String.normalizeEol() = replace(Regex("[\r\n]+"), "\n")
 
@@ -143,8 +176,9 @@ open class BaseGradleTest {
 
                 maven {
                    url = uri("${
-                        File(it).toURI().toASCIIString().replace(Regex("""[\\"$]""")) { "\\" + it.value }
-                   }")
+                        File(it).toURI().toASCIIString()
+                            .replace(Regex("""[\\"$]""")) { "\\" + it.value }
+                    }")
                 }
                 """.trimIndent().prependIndent("            ")
                 }
@@ -158,15 +192,16 @@ open class BaseGradleTest {
         """
         dependencies {
             ${
-                when (sigstoreJava) {
-                    TestedSigstoreJava.Default -> ""
-                    is TestedSigstoreJava.Version ->
-                        "sigstoreClient(\"dev.sigstore:sigstore-java:${sigstoreJava.version}\")"
-                    is TestedSigstoreJava.LocallyBuiltVersion ->
-                        "sigstoreClient(\"dev.sigstore:sigstore-java:${sigstoreJava.version}\")"
-                }
+            when (sigstoreJava) {
+                TestedSigstoreJava.Default -> ""
+                is TestedSigstoreJava.Version ->
+                    "sigstoreClient(\"dev.sigstore:sigstore-java:${sigstoreJava.version}\")"
+
+                is TestedSigstoreJava.LocallyBuiltVersion ->
+                    "sigstoreClient(\"dev.sigstore:sigstore-java:${sigstoreJava.version}\")"
             }
         }
+        }
         """.trimIndent()
 
     protected fun declareRepositoryAndDependency(sigstoreJava: TestedSigstoreJava) =
@@ -206,6 +241,7 @@ open class BaseGradleTest {
             .withArguments(*arguments)
             .forwardOutput()
 
+
     protected fun enableConfigurationCache(
         gradle: TestedGradle,
     ) {