Update github-workflows-kt version to 2.0.0

spockframework · Aug 8, 2024 · c02372f · c02372f
1 parent 267d269
commit c02372f
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 22 deletions.
diff --git a/.github/workflows/branches-and-prs.main.kts b/.github/workflows/branches-and-prs.main.kts
@@ -29,7 +29,6 @@ import io.github.typesafegithub.workflows.domain.triggers.Push
 import io.github.typesafegithub.workflows.dsl.expressions.Contexts.github
 import io.github.typesafegithub.workflows.dsl.expressions.expr
 import io.github.typesafegithub.workflows.dsl.workflow
-import io.github.typesafegithub.workflows.yaml.writeToFile
 
 workflow(
     name = "Verify Branches and PRs",
@@ -43,7 +42,7 @@ workflow(
         PullRequest(),
         MergeGroup()
     ),
-    sourceFile = __FILE__.toPath(),
+    sourceFile = __FILE__,
     targetFileName = "${__FILE__.name.substringBeforeLast(".main.kts")}.yml",
     // https://stackoverflow.com/a/72408109/16358266
     concurrency = Concurrency(
@@ -104,4 +103,4 @@ workflow(
             action = CodecovActionV4()
         )
     }
-}.writeToFile()
+}
diff --git a/.github/workflows/codeql-analysis.main.kts b/.github/workflows/codeql-analysis.main.kts
@@ -31,7 +31,6 @@ import io.github.typesafegithub.workflows.domain.triggers.Schedule
 import io.github.typesafegithub.workflows.dsl.expressions.Contexts.github
 import io.github.typesafegithub.workflows.dsl.expressions.expr
 import io.github.typesafegithub.workflows.dsl.workflow
-import io.github.typesafegithub.workflows.yaml.writeToFile
 
 workflow(
     name = "Code scanning - action",
@@ -51,7 +50,7 @@ workflow(
             )
         )
     ),
-    sourceFile = __FILE__.toPath(),
+    sourceFile = __FILE__,
     targetFileName = "${__FILE__.name.substringBeforeLast(".main.kts")}.yml",
     // https://stackoverflow.com/a/72408109/16358266
     concurrency = Concurrency(
@@ -127,4 +126,4 @@ workflow(
             action = CodeqlActionAnalyzeV2(_customVersion = "v3")
         )
     }
-}.writeToFile()
+}
diff --git a/.github/workflows/common.main.kts b/.github/workflows/common.main.kts
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-@file:DependsOn("io.github.typesafegithub:github-workflows-kt:1.14.0")
+@file:DependsOn("io.github.typesafegithub:github-workflows-kt:2.0.0")
 
 import io.github.typesafegithub.workflows.domain.Job
 import io.github.typesafegithub.workflows.domain.JobOutputs.EMPTY
@@ -31,7 +31,7 @@ import java.util.Properties
 
 val GRADLE_ENTERPRISE_ACCESS_KEY by secrets
 
-val commonCredentials = linkedMapOf(
+val commonCredentials = mapOf(
     "DEVELOCITY_ACCESS_KEY" to expr(GRADLE_ENTERPRISE_ACCESS_KEY)
 )
 
@@ -61,7 +61,7 @@ data class Matrix(
             .flatMap { element -> (javaVersions ?: listOf(null)).map { element.copy(javaVersion = it) } }
     }
 
-    fun toCustomArguments() = linkedMapOf(
+    fun toCustomArguments() = mapOf(
         *listOfNotNull(
             variants?.let { "variant" to variants },
             javaVersions?.let { "java" to javaVersions },
@@ -85,7 +85,7 @@ data class Matrix(
         val variant: String? = null,
         val javaVersion: String? = null
     ) {
-        fun toCustomArguments() = linkedMapOf(
+        fun toCustomArguments() = mapOf(
             *listOfNotNull(
                 variant?.let { "variant" to variant },
                 javaVersion?.let { "java" to javaVersion },

diff --git a/.github/workflows/docs-pr.main.kts b/.github/workflows/docs-pr.main.kts
@@ -28,7 +28,6 @@ import io.github.typesafegithub.workflows.domain.triggers.Push
 import io.github.typesafegithub.workflows.dsl.expressions.Contexts.github
 import io.github.typesafegithub.workflows.dsl.expressions.expr
 import io.github.typesafegithub.workflows.dsl.workflow
-import io.github.typesafegithub.workflows.yaml.writeToFile
 
 workflow(
     name = "Verify Docs",
@@ -42,7 +41,7 @@ workflow(
         PullRequest(),
         MergeGroup()
     ),
-    sourceFile = __FILE__.toPath(),
+    sourceFile = __FILE__,
     targetFileName = "${__FILE__.name.substringBeforeLast(".main.kts")}.yml",
     // https://stackoverflow.com/a/72408109/16358266
     concurrency = Concurrency(
@@ -93,4 +92,4 @@ workflow(
             )
         )
     }
-}.writeToFile()
+}
diff --git a/.github/workflows/gradle-wrapper-validation.main.kts b/.github/workflows/gradle-wrapper-validation.main.kts
@@ -25,7 +25,6 @@ import io.github.typesafegithub.workflows.domain.triggers.MergeGroup
 import io.github.typesafegithub.workflows.domain.triggers.PullRequest
 import io.github.typesafegithub.workflows.domain.triggers.Push
 import io.github.typesafegithub.workflows.dsl.workflow
-import io.github.typesafegithub.workflows.yaml.writeToFile
 
 workflow(
     name = "Validate Gradle Wrapper",
@@ -34,7 +33,7 @@ workflow(
         PullRequest(),
         MergeGroup()
     ),
-    sourceFile = __FILE__.toPath(),
+    sourceFile = __FILE__,
     targetFileName = "${__FILE__.name.substringBeforeLast(".main.kts")}.yml"
 ) {
     job(
@@ -51,4 +50,4 @@ workflow(
             action = WrapperValidationActionV2(_customVersion = "v3")
         )
     }
-}.writeToFile()
+}
diff --git a/.github/workflows/release.main.kts b/.github/workflows/release.main.kts
@@ -27,7 +27,6 @@ import io.github.typesafegithub.workflows.dsl.expressions.Contexts.github
 import io.github.typesafegithub.workflows.dsl.expressions.Contexts.secrets
 import io.github.typesafegithub.workflows.dsl.expressions.expr
 import io.github.typesafegithub.workflows.dsl.workflow
-import io.github.typesafegithub.workflows.yaml.writeToFile
 
 workflow(
     name = "Build and Release Spock",
@@ -37,7 +36,7 @@ workflow(
             tags = listOf("spock-*")
         )
     ),
-    sourceFile = __FILE__.toPath(),
+    sourceFile = __FILE__,
     targetFileName = "${__FILE__.name.substringBeforeLast(".main.kts")}.yml"
 ) {
     val GITHUB_TOKEN by secrets
@@ -122,7 +121,7 @@ workflow(
                 """"-DjavaVersion=${expr(Matrix.javaVersion)}"""",
                 "-Dscan.tag.main-publish"
             ).joinToString(" "),
-            env = linkedMapOf(
+            env = mutableMapOf(
                 "GITHUB_TOKEN" to expr(GITHUB_TOKEN),
                 "SONATYPE_OSS_USER" to expr(SONATYPE_OSS_USER),
                 "SONATYPE_OSS_PASSWORD" to expr(SONATYPE_OSS_PASSWORD),
@@ -135,7 +134,7 @@ workflow(
         name = "Publish Release Docs",
         runsOn = RunnerType.Custom(expr(Matrix.operatingSystem)),
         needs = listOf(releaseSpock),
-        strategyMatrix = linkedMapOf(
+        strategyMatrix = mapOf(
             // docs need the highest variant
             "variant" to Matrix.axes.variants.takeLast(1),
             // docs need the highest java version
@@ -172,9 +171,9 @@ workflow(
                 """"-DjavaVersion=${expr(Matrix.javaVersion)}"""",
                 "-Dscan.tag.main-docs"
             ).joinToString(" "),
-            env = linkedMapOf(
+            env = mutableMapOf(
                 "GITHUB_TOKEN" to expr(GITHUB_TOKEN)
             ).apply { putAll(commonCredentials) }
         )
     }
-}.writeToFile()
+}