From 43dcdf00ee916c0d9a8ac256787b18bfe7c15d68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20Krzemi=C5=84ski?= <3110813+krzema12@users.noreply.github.com> Date: Thu, 9 May 2024 09:59:27 +0200 Subject: [PATCH] chore(dsl)!: change type of sourceFile to File (#1439) Part of #1412. --- .github/workflows/end-to-end-tests.main.kts | 2 +- .../typesafegithub/workflows/updates/Utils.kt | 2 +- .../workflows/updates/ReportingTest.kt | 2 +- .../api/github-workflows-kt.api | 20 ++++++++-------- .../workflows/domain/Workflow.kt | 4 ++-- .../workflows/dsl/JobBuilder.kt | 2 +- .../workflows/dsl/WorkflowBuilder.kt | 12 ++++++---- .../typesafegithub/workflows/yaml/ToYaml.kt | 2 +- .../workflows/IntegrationTest.kt | 24 +++++++++---------- ...ensatingLibrarysMissingFeaturesSnippets.kt | 2 +- .../docsnippets/GettingStartedSnippets.kt | 2 +- .../docsnippets/JobOutputsSnippets.kt | 2 +- .../TypeSafeExpressionsSnippets.kt | 6 ++--- .../docsnippets/UsingActionsSnippets.kt | 8 +++---- .../workflows/dsl/JobBuilderTest.kt | 8 +++---- .../workflows/dsl/WorkflowBuilderTest.kt | 8 +++---- images/teaser.svg | 2 +- 17 files changed, 56 insertions(+), 52 deletions(-) diff --git a/.github/workflows/end-to-end-tests.main.kts b/.github/workflows/end-to-end-tests.main.kts index bf0f2e9ea..3b6d57673 100755 --- a/.github/workflows/end-to-end-tests.main.kts +++ b/.github/workflows/end-to-end-tests.main.kts @@ -54,7 +54,7 @@ workflow( yamlConsistencyJobAdditionalSteps = { publishToMavenLocal() }, - sourceFile = __FILE__.toPath(), + sourceFile = __FILE__, ) { val GREETING by Contexts.env val FIRST_NAME by Contexts.env diff --git a/action-updates-checker/src/main/kotlin/io/github/typesafegithub/workflows/updates/Utils.kt b/action-updates-checker/src/main/kotlin/io/github/typesafegithub/workflows/updates/Utils.kt index c10321859..b1b8d2c9c 100644 --- a/action-updates-checker/src/main/kotlin/io/github/typesafegithub/workflows/updates/Utils.kt +++ b/action-updates-checker/src/main/kotlin/io/github/typesafegithub/workflows/updates/Utils.kt @@ -95,7 +95,7 @@ internal fun RegularAction<*>.mavenCoordinatesForAction(version: Version? = null } internal fun Workflow.findDependencyDeclaration(action: RegularAction<*>): Pair { - val file = sourceFile?.takeIf { it.exists() } + val file = sourceFile?.toPath()?.takeIf { it.exists() } val line = file?.let { sourceFile -> val currentCoordinates = action.mavenCoordinatesForAction() diff --git a/action-updates-checker/src/test/kotlin/io/github/typesafegithub/workflows/updates/ReportingTest.kt b/action-updates-checker/src/test/kotlin/io/github/typesafegithub/workflows/updates/ReportingTest.kt index 84bea42fa..5e91f87a7 100644 --- a/action-updates-checker/src/test/kotlin/io/github/typesafegithub/workflows/updates/ReportingTest.kt +++ b/action-updates-checker/src/test/kotlin/io/github/typesafegithub/workflows/updates/ReportingTest.kt @@ -29,7 +29,7 @@ class ReportingTest : FunSpec( workflow( name = "Test workflow", on = listOf(Push()), - sourceFile = sourceTempFile.toPath(), + sourceFile = sourceTempFile, ) { job( id = "test_job", diff --git a/github-workflows-kt/api/github-workflows-kt.api b/github-workflows-kt/api/github-workflows-kt.api index 15c7b815b..0dd700b98 100644 --- a/github-workflows-kt/api/github-workflows-kt.api +++ b/github-workflows-kt/api/github-workflows-kt.api @@ -484,22 +484,22 @@ public abstract interface class io/github/typesafegithub/workflows/domain/WithOu } public final class io/github/typesafegithub/workflows/domain/Workflow : io/github/typesafegithub/workflows/dsl/HasCustomArguments { - public fun (Ljava/lang/String;Ljava/util/List;Ljava/util/Map;Ljava/nio/file/Path;Ljava/lang/String;Lio/github/typesafegithub/workflows/domain/Concurrency;Ljava/util/Map;Ljava/lang/String;Ljava/util/Map;Lkotlin/jvm/functions/Function1;Ljava/util/List;Ljava/util/Map;)V - public synthetic fun (Ljava/lang/String;Ljava/util/List;Ljava/util/Map;Ljava/nio/file/Path;Ljava/lang/String;Lio/github/typesafegithub/workflows/domain/Concurrency;Ljava/util/Map;Ljava/lang/String;Ljava/util/Map;Lkotlin/jvm/functions/Function1;Ljava/util/List;Ljava/util/Map;ILkotlin/jvm/internal/DefaultConstructorMarker;)V + public fun (Ljava/lang/String;Ljava/util/List;Ljava/util/Map;Ljava/io/File;Ljava/lang/String;Lio/github/typesafegithub/workflows/domain/Concurrency;Ljava/util/Map;Ljava/lang/String;Ljava/util/Map;Lkotlin/jvm/functions/Function1;Ljava/util/List;Ljava/util/Map;)V + public synthetic fun (Ljava/lang/String;Ljava/util/List;Ljava/util/Map;Ljava/io/File;Ljava/lang/String;Lio/github/typesafegithub/workflows/domain/Concurrency;Ljava/util/Map;Ljava/lang/String;Ljava/util/Map;Lkotlin/jvm/functions/Function1;Ljava/util/List;Ljava/util/Map;ILkotlin/jvm/internal/DefaultConstructorMarker;)V public final fun component1 ()Ljava/lang/String; public final fun component10 ()Lkotlin/jvm/functions/Function1; public final fun component11 ()Ljava/util/List; public final fun component12 ()Ljava/util/Map; public final fun component2 ()Ljava/util/List; public final fun component3 ()Ljava/util/Map; - public final fun component4 ()Ljava/nio/file/Path; + public final fun component4 ()Ljava/io/File; public final fun component5 ()Ljava/lang/String; public final fun component6 ()Lio/github/typesafegithub/workflows/domain/Concurrency; public final fun component7 ()Ljava/util/Map; public final fun component8 ()Ljava/lang/String; public final fun component9 ()Ljava/util/Map; - public final fun copy (Ljava/lang/String;Ljava/util/List;Ljava/util/Map;Ljava/nio/file/Path;Ljava/lang/String;Lio/github/typesafegithub/workflows/domain/Concurrency;Ljava/util/Map;Ljava/lang/String;Ljava/util/Map;Lkotlin/jvm/functions/Function1;Ljava/util/List;Ljava/util/Map;)Lio/github/typesafegithub/workflows/domain/Workflow; - public static synthetic fun copy$default (Lio/github/typesafegithub/workflows/domain/Workflow;Ljava/lang/String;Ljava/util/List;Ljava/util/Map;Ljava/nio/file/Path;Ljava/lang/String;Lio/github/typesafegithub/workflows/domain/Concurrency;Ljava/util/Map;Ljava/lang/String;Ljava/util/Map;Lkotlin/jvm/functions/Function1;Ljava/util/List;Ljava/util/Map;ILjava/lang/Object;)Lio/github/typesafegithub/workflows/domain/Workflow; + public final fun copy (Ljava/lang/String;Ljava/util/List;Ljava/util/Map;Ljava/io/File;Ljava/lang/String;Lio/github/typesafegithub/workflows/domain/Concurrency;Ljava/util/Map;Ljava/lang/String;Ljava/util/Map;Lkotlin/jvm/functions/Function1;Ljava/util/List;Ljava/util/Map;)Lio/github/typesafegithub/workflows/domain/Workflow; + public static synthetic fun copy$default (Lio/github/typesafegithub/workflows/domain/Workflow;Ljava/lang/String;Ljava/util/List;Ljava/util/Map;Ljava/io/File;Ljava/lang/String;Lio/github/typesafegithub/workflows/domain/Concurrency;Ljava/util/Map;Ljava/lang/String;Ljava/util/Map;Lkotlin/jvm/functions/Function1;Ljava/util/List;Ljava/util/Map;ILjava/lang/Object;)Lio/github/typesafegithub/workflows/domain/Workflow; public fun equals (Ljava/lang/Object;)Z public final fun getConcurrency ()Lio/github/typesafegithub/workflows/domain/Concurrency; public final fun getEnv ()Ljava/util/Map; @@ -507,7 +507,7 @@ public final class io/github/typesafegithub/workflows/domain/Workflow : io/githu public final fun getName ()Ljava/lang/String; public final fun getOn ()Ljava/util/List; public final fun getPermissions ()Ljava/util/Map; - public final fun getSourceFile ()Ljava/nio/file/Path; + public final fun getSourceFile ()Ljava/io/File; public final fun getTargetFileName ()Ljava/lang/String; public final fun getYamlConsistencyJobAdditionalSteps ()Lkotlin/jvm/functions/Function1; public final fun getYamlConsistencyJobCondition ()Ljava/lang/String; @@ -1899,8 +1899,8 @@ public final class io/github/typesafegithub/workflows/dsl/JobBuilder : io/github } public final class io/github/typesafegithub/workflows/dsl/WorkflowBuilder { - public fun (Ljava/lang/String;Ljava/util/List;Ljava/util/Map;Ljava/nio/file/Path;Ljava/lang/String;Lio/github/typesafegithub/workflows/domain/Concurrency;Ljava/nio/file/Path;Ljava/lang/String;Ljava/util/Map;Lkotlin/jvm/functions/Function1;Ljava/util/List;Ljava/util/Map;Ljava/util/Map;)V - public synthetic fun (Ljava/lang/String;Ljava/util/List;Ljava/util/Map;Ljava/nio/file/Path;Ljava/lang/String;Lio/github/typesafegithub/workflows/domain/Concurrency;Ljava/nio/file/Path;Ljava/lang/String;Ljava/util/Map;Lkotlin/jvm/functions/Function1;Ljava/util/List;Ljava/util/Map;Ljava/util/Map;ILkotlin/jvm/internal/DefaultConstructorMarker;)V + public fun (Ljava/lang/String;Ljava/util/List;Ljava/util/Map;Ljava/io/File;Ljava/lang/String;Lio/github/typesafegithub/workflows/domain/Concurrency;Ljava/nio/file/Path;Ljava/lang/String;Ljava/util/Map;Lkotlin/jvm/functions/Function1;Ljava/util/List;Ljava/util/Map;Ljava/util/Map;)V + public synthetic fun (Ljava/lang/String;Ljava/util/List;Ljava/util/Map;Ljava/io/File;Ljava/lang/String;Lio/github/typesafegithub/workflows/domain/Concurrency;Ljava/nio/file/Path;Ljava/lang/String;Ljava/util/Map;Lkotlin/jvm/functions/Function1;Ljava/util/List;Ljava/util/Map;Ljava/util/Map;ILkotlin/jvm/internal/DefaultConstructorMarker;)V public final fun build ()Lio/github/typesafegithub/workflows/domain/Workflow; public final fun getGitRootDir ()Ljava/nio/file/Path; public final fun job ([Lkotlin/Unit;Ljava/lang/String;Ljava/lang/String;Lio/github/typesafegithub/workflows/domain/RunnerType;Ljava/util/List;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/lang/Integer;Lio/github/typesafegithub/workflows/domain/Concurrency;Lio/github/typesafegithub/workflows/domain/Container;Lio/github/typesafegithub/workflows/domain/Environment;Ljava/util/Map;Lio/github/typesafegithub/workflows/domain/JobOutputs;Lkotlin/jvm/functions/Function1;)Lio/github/typesafegithub/workflows/domain/Job; @@ -1911,8 +1911,8 @@ public final class io/github/typesafegithub/workflows/dsl/WorkflowBuilder { public final class io/github/typesafegithub/workflows/dsl/WorkflowBuilderKt { public static final fun toBuilder (Lio/github/typesafegithub/workflows/domain/Workflow;)Lio/github/typesafegithub/workflows/dsl/WorkflowBuilder; - public static final fun workflow ([Lkotlin/Unit;Ljava/lang/String;Ljava/util/List;Ljava/util/Map;Ljava/nio/file/Path;Ljava/lang/String;Lio/github/typesafegithub/workflows/domain/Concurrency;Ljava/lang/String;Ljava/util/Map;Lkotlin/jvm/functions/Function1;Ljava/util/Map;ZLjava/nio/file/Path;Lio/github/typesafegithub/workflows/yaml/Preamble;Lkotlin/jvm/functions/Function1;Ljava/util/Map;Lkotlin/jvm/functions/Function1;)Lio/github/typesafegithub/workflows/domain/Workflow; - public static synthetic fun workflow$default ([Lkotlin/Unit;Ljava/lang/String;Ljava/util/List;Ljava/util/Map;Ljava/nio/file/Path;Ljava/lang/String;Lio/github/typesafegithub/workflows/domain/Concurrency;Ljava/lang/String;Ljava/util/Map;Lkotlin/jvm/functions/Function1;Ljava/util/Map;ZLjava/nio/file/Path;Lio/github/typesafegithub/workflows/yaml/Preamble;Lkotlin/jvm/functions/Function1;Ljava/util/Map;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lio/github/typesafegithub/workflows/domain/Workflow; + public static final fun workflow ([Lkotlin/Unit;Ljava/lang/String;Ljava/util/List;Ljava/util/Map;Ljava/io/File;Ljava/lang/String;Lio/github/typesafegithub/workflows/domain/Concurrency;Ljava/lang/String;Ljava/util/Map;Lkotlin/jvm/functions/Function1;Ljava/util/Map;ZLjava/nio/file/Path;Lio/github/typesafegithub/workflows/yaml/Preamble;Lkotlin/jvm/functions/Function1;Ljava/util/Map;Lkotlin/jvm/functions/Function1;)Lio/github/typesafegithub/workflows/domain/Workflow; + public static synthetic fun workflow$default ([Lkotlin/Unit;Ljava/lang/String;Ljava/util/List;Ljava/util/Map;Ljava/io/File;Ljava/lang/String;Lio/github/typesafegithub/workflows/domain/Concurrency;Ljava/lang/String;Ljava/util/Map;Lkotlin/jvm/functions/Function1;Ljava/util/Map;ZLjava/nio/file/Path;Lio/github/typesafegithub/workflows/yaml/Preamble;Lkotlin/jvm/functions/Function1;Ljava/util/Map;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lio/github/typesafegithub/workflows/domain/Workflow; } public final class io/github/typesafegithub/workflows/dsl/expressions/Contexts : io/github/typesafegithub/workflows/dsl/expressions/contexts/FunctionsContext { diff --git a/github-workflows-kt/src/main/kotlin/io/github/typesafegithub/workflows/domain/Workflow.kt b/github-workflows-kt/src/main/kotlin/io/github/typesafegithub/workflows/domain/Workflow.kt index d984ec85a..89e018e76 100644 --- a/github-workflows-kt/src/main/kotlin/io/github/typesafegithub/workflows/domain/Workflow.kt +++ b/github-workflows-kt/src/main/kotlin/io/github/typesafegithub/workflows/domain/Workflow.kt @@ -4,13 +4,13 @@ import io.github.typesafegithub.workflows.domain.triggers.Trigger import io.github.typesafegithub.workflows.dsl.HasCustomArguments import io.github.typesafegithub.workflows.dsl.JobBuilder import kotlinx.serialization.Contextual -import java.nio.file.Path +import java.io.File public data class Workflow( val name: String, val on: List, val env: Map, - val sourceFile: Path?, + val sourceFile: File?, val targetFileName: String?, val concurrency: Concurrency? = null, val permissions: Map? = null, diff --git a/github-workflows-kt/src/main/kotlin/io/github/typesafegithub/workflows/dsl/JobBuilder.kt b/github-workflows-kt/src/main/kotlin/io/github/typesafegithub/workflows/dsl/JobBuilder.kt index 1a3bbc706..f3f1d2409 100644 --- a/github-workflows-kt/src/main/kotlin/io/github/typesafegithub/workflows/dsl/JobBuilder.kt +++ b/github-workflows-kt/src/main/kotlin/io/github/typesafegithub/workflows/dsl/JobBuilder.kt @@ -136,7 +136,7 @@ public class JobBuilder( val id = "step-${job.steps.size}" val sourceFilePath = workflowBuilder.gitRootDir?.let { - sourceFile.relativeToAbsolute(it).invariantSeparatorsPathString + sourceFile.toPath().relativeToAbsolute(it).invariantSeparatorsPathString } val newStep = KotlinLogicStep( diff --git a/github-workflows-kt/src/main/kotlin/io/github/typesafegithub/workflows/dsl/WorkflowBuilder.kt b/github-workflows-kt/src/main/kotlin/io/github/typesafegithub/workflows/dsl/WorkflowBuilder.kt index 72bef2103..e2d94c6a6 100644 --- a/github-workflows-kt/src/main/kotlin/io/github/typesafegithub/workflows/dsl/WorkflowBuilder.kt +++ b/github-workflows-kt/src/main/kotlin/io/github/typesafegithub/workflows/dsl/WorkflowBuilder.kt @@ -14,6 +14,7 @@ import io.github.typesafegithub.workflows.shared.internal.findGitRoot import io.github.typesafegithub.workflows.yaml.Preamble import io.github.typesafegithub.workflows.yaml.writeToFile import kotlinx.serialization.Contextual +import java.io.File import java.nio.file.Path import kotlin.io.path.absolute @@ -23,7 +24,7 @@ public class WorkflowBuilder( name: String, on: List, env: Map = mapOf(), - sourceFile: Path?, + sourceFile: File?, targetFileName: String?, concurrency: Concurrency? = null, public val gitRootDir: Path? = null, @@ -169,15 +170,18 @@ public fun workflow( name: String, on: List, env: Map = mapOf(), - sourceFile: Path? = null, - targetFileName: String? = sourceFile?.fileName?.let { it.toString().substringBeforeLast(".main.kts") + ".yaml" }, + sourceFile: File? = null, + targetFileName: String? = + sourceFile?.toPath()?.fileName?.let { + it.toString().substringBeforeLast(".main.kts") + ".yaml" + }, concurrency: Concurrency? = null, yamlConsistencyJobCondition: String? = null, yamlConsistencyJobEnv: Map = mapOf(), yamlConsistencyJobAdditionalSteps: (JobBuilder.() -> Unit)? = null, permissions: Map? = null, addConsistencyCheck: Boolean = sourceFile != null, - gitRootDir: Path? = sourceFile?.absolute()?.findGitRoot(), + gitRootDir: Path? = sourceFile?.toPath()?.absolute()?.findGitRoot(), preamble: Preamble? = null, getenv: (String) -> String? = { System.getenv(it) }, _customArguments: Map = mapOf(), diff --git a/github-workflows-kt/src/main/kotlin/io/github/typesafegithub/workflows/yaml/ToYaml.kt b/github-workflows-kt/src/main/kotlin/io/github/typesafegithub/workflows/yaml/ToYaml.kt index 0934113f5..b83153209 100644 --- a/github-workflows-kt/src/main/kotlin/io/github/typesafegithub/workflows/yaml/ToYaml.kt +++ b/github-workflows-kt/src/main/kotlin/io/github/typesafegithub/workflows/yaml/ToYaml.kt @@ -99,7 +99,7 @@ private fun Workflow.generateYaml( ): String { val sourceFilePath = gitRootDir?.let { - sourceFile?.relativeToAbsolute(gitRootDir)?.invariantSeparatorsPathString + sourceFile?.toPath()?.relativeToAbsolute(gitRootDir)?.invariantSeparatorsPathString } val jobsWithConsistencyCheck = diff --git a/github-workflows-kt/src/test/kotlin/io/github/typesafegithub/workflows/IntegrationTest.kt b/github-workflows-kt/src/test/kotlin/io/github/typesafegithub/workflows/IntegrationTest.kt index 2db492b4d..0ab795110 100644 --- a/github-workflows-kt/src/test/kotlin/io/github/typesafegithub/workflows/IntegrationTest.kt +++ b/github-workflows-kt/src/test/kotlin/io/github/typesafegithub/workflows/IntegrationTest.kt @@ -33,7 +33,7 @@ class IntegrationTest : FunSpec({ workflow( name = "Test workflow", on = listOf(Push()), - sourceFile = sourceTempFile.toPath(), + sourceFile = sourceTempFile, yamlConsistencyJobEnv = mapOf("GITHUB_TOKEN" to expr("secrets.GITHUB_TOKEN")), ) { job( @@ -108,7 +108,7 @@ class IntegrationTest : FunSpec({ hello! workflow """.trimIndent(), ), - sourceFile = sourceTempFile.toPath(), + sourceFile = sourceTempFile, addConsistencyCheck = false, _customArguments = mapOf( @@ -233,7 +233,7 @@ class IntegrationTest : FunSpec({ workflow( name = "Test workflow", on = listOf(Push()), - sourceFile = sourceTempFile.toPath(), + sourceFile = sourceTempFile, addConsistencyCheck = false, concurrency = Concurrency("workflow_staging_environment"), ) { @@ -295,7 +295,7 @@ class IntegrationTest : FunSpec({ workflow( name = "Test workflow", on = listOf(Push()), - sourceFile = sourceTempFile.toPath(), + sourceFile = sourceTempFile, addConsistencyCheck = false, ) { job(id = "deploy-dev", runsOn = RunnerType.UbuntuLatest) { @@ -373,7 +373,7 @@ class IntegrationTest : FunSpec({ workflow( name = "Test workflow", on = listOf(Push()), - sourceFile = sourceTempFile.toPath(), + sourceFile = sourceTempFile, addConsistencyCheck = false, concurrency = Concurrency("workflow_staging_environment", cancelInProgress = true), ) { @@ -435,7 +435,7 @@ class IntegrationTest : FunSpec({ name = "Test workflow", on = listOf(Push()), yamlConsistencyJobCondition = "\${{ always() }}", - sourceFile = sourceTempFile.toPath(), + sourceFile = sourceTempFile, ) { job( id = "test_job", @@ -538,7 +538,7 @@ class IntegrationTest : FunSpec({ workflow( name = "test", on = listOf(Push()), - sourceFile = sourceTempFile.toPath(), + sourceFile = sourceTempFile, preamble = Just( """ @@ -575,7 +575,7 @@ class IntegrationTest : FunSpec({ workflow( name = "test", on = listOf(Push()), - sourceFile = sourceTempFile.toPath(), + sourceFile = sourceTempFile, preamble = Just( """ @@ -614,7 +614,7 @@ class IntegrationTest : FunSpec({ workflow( name = "Test workflow", on = listOf(Push()), - sourceFile = sourceTempFile.toPath(), + sourceFile = sourceTempFile, preamble = WithOriginalAfter( """ @@ -657,7 +657,7 @@ class IntegrationTest : FunSpec({ workflow( name = "Test workflow", on = listOf(Push()), - sourceFile = sourceTempFile.toPath(), + sourceFile = sourceTempFile, preamble = WithOriginalBefore( """ @@ -700,7 +700,7 @@ class IntegrationTest : FunSpec({ workflow( name = "test", on = listOf(Push()), - sourceFile = sourceTempFile.toPath(), + sourceFile = sourceTempFile, preamble = Just(""), addConsistencyCheck = false, ) { @@ -731,7 +731,7 @@ class IntegrationTest : FunSpec({ workflow( name = "test", on = listOf(Push()), - sourceFile = sourceTempFile.toPath(), + sourceFile = sourceTempFile, ) { job(id = "test", runsOn = RunnerType.UbuntuLatest) { run(name = "Step with Kotlin code in lambda") { diff --git a/github-workflows-kt/src/test/kotlin/io/github/typesafegithub/workflows/docsnippets/CompensatingLibrarysMissingFeaturesSnippets.kt b/github-workflows-kt/src/test/kotlin/io/github/typesafegithub/workflows/docsnippets/CompensatingLibrarysMissingFeaturesSnippets.kt index ef95c46f4..7cb0dbcc6 100644 --- a/github-workflows-kt/src/test/kotlin/io/github/typesafegithub/workflows/docsnippets/CompensatingLibrarysMissingFeaturesSnippets.kt +++ b/github-workflows-kt/src/test/kotlin/io/github/typesafegithub/workflows/docsnippets/CompensatingLibrarysMissingFeaturesSnippets.kt @@ -23,7 +23,7 @@ class CompensatingLibrarysMissingFeaturesSnippets : FunSpec({ // --8<-- [end:custom-arguments-1] name = "customArguments", on = listOf(Push()), - sourceFile = sourceTempFile.toPath(), + sourceFile = sourceTempFile, // --8<-- [start:custom-arguments-2] // ... _customArguments = diff --git a/github-workflows-kt/src/test/kotlin/io/github/typesafegithub/workflows/docsnippets/GettingStartedSnippets.kt b/github-workflows-kt/src/test/kotlin/io/github/typesafegithub/workflows/docsnippets/GettingStartedSnippets.kt index c1e1f36a9..ad3c4820f 100644 --- a/github-workflows-kt/src/test/kotlin/io/github/typesafegithub/workflows/docsnippets/GettingStartedSnippets.kt +++ b/github-workflows-kt/src/test/kotlin/io/github/typesafegithub/workflows/docsnippets/GettingStartedSnippets.kt @@ -28,7 +28,7 @@ class GettingStartedSnippets : FunSpec({ workflow( name = "Test workflow", on = listOf(Push()), - sourceFile = __FILE__.toPath(), + sourceFile = __FILE__, ) { job(id = "test_job", runsOn = UbuntuLatest) { uses(name = "Check out", action = CheckoutV4()) diff --git a/github-workflows-kt/src/test/kotlin/io/github/typesafegithub/workflows/docsnippets/JobOutputsSnippets.kt b/github-workflows-kt/src/test/kotlin/io/github/typesafegithub/workflows/docsnippets/JobOutputsSnippets.kt index 355021f8c..dd79a810c 100644 --- a/github-workflows-kt/src/test/kotlin/io/github/typesafegithub/workflows/docsnippets/JobOutputsSnippets.kt +++ b/github-workflows-kt/src/test/kotlin/io/github/typesafegithub/workflows/docsnippets/JobOutputsSnippets.kt @@ -23,7 +23,7 @@ class JobOutputsSnippets : FunSpec({ workflow( name = "Test workflow", on = listOf(Push()), - sourceFile = sourceTempFile.toPath(), + sourceFile = sourceTempFile, ) { // --8<-- [start:define-job-outputs-1] val myJob = diff --git a/github-workflows-kt/src/test/kotlin/io/github/typesafegithub/workflows/docsnippets/TypeSafeExpressionsSnippets.kt b/github-workflows-kt/src/test/kotlin/io/github/typesafegithub/workflows/docsnippets/TypeSafeExpressionsSnippets.kt index 3936dc119..ece2f28e2 100644 --- a/github-workflows-kt/src/test/kotlin/io/github/typesafegithub/workflows/docsnippets/TypeSafeExpressionsSnippets.kt +++ b/github-workflows-kt/src/test/kotlin/io/github/typesafegithub/workflows/docsnippets/TypeSafeExpressionsSnippets.kt @@ -21,7 +21,7 @@ class TypeSafeExpressionsSnippets : FunSpec({ workflow( name = "Test workflow", on = listOf(Push()), - sourceFile = sourceTempFile.toPath(), + sourceFile = sourceTempFile, ) { job( id = "test_job", @@ -46,7 +46,7 @@ class TypeSafeExpressionsSnippets : FunSpec({ workflow( name = "Test workflow", on = listOf(Push()), - sourceFile = sourceTempFile.toPath(), + sourceFile = sourceTempFile, ) { // --8<-- [start:custom-environment-variables-1] val GREETING by Contexts.env @@ -79,7 +79,7 @@ class TypeSafeExpressionsSnippets : FunSpec({ workflow( name = "Test workflow", on = listOf(Push()), - sourceFile = sourceTempFile.toPath(), + sourceFile = sourceTempFile, ) { // --8<-- [start:secrets] val SUPER_SECRET by Contexts.secrets diff --git a/github-workflows-kt/src/test/kotlin/io/github/typesafegithub/workflows/docsnippets/UsingActionsSnippets.kt b/github-workflows-kt/src/test/kotlin/io/github/typesafegithub/workflows/docsnippets/UsingActionsSnippets.kt index 73b9a229f..ce214e1b6 100644 --- a/github-workflows-kt/src/test/kotlin/io/github/typesafegithub/workflows/docsnippets/UsingActionsSnippets.kt +++ b/github-workflows-kt/src/test/kotlin/io/github/typesafegithub/workflows/docsnippets/UsingActionsSnippets.kt @@ -60,7 +60,7 @@ class UsingActionsSnippets : FunSpec({ workflow( name = "Test workflow", on = listOf(Push()), - sourceFile = sourceTempFile.toPath(), + sourceFile = sourceTempFile, ) { job(id = "test-job", runsOn = RunnerType.UbuntuLatest) { // --8<-- [start:using] @@ -121,7 +121,7 @@ class UsingActionsSnippets : FunSpec({ workflow( name = "Test workflow", on = listOf(Push()), - sourceFile = sourceTempFile.toPath(), + sourceFile = sourceTempFile, ) { // --8<-- [start:custom-action-outputs] job(id = "test_job", runsOn = RunnerType.UbuntuLatest) { @@ -149,7 +149,7 @@ class UsingActionsSnippets : FunSpec({ workflow( name = "Test workflow", on = listOf(Push()), - sourceFile = sourceTempFile.toPath(), + sourceFile = sourceTempFile, ) { job(id = "test_job", runsOn = RunnerType.UbuntuLatest) { uses( @@ -172,7 +172,7 @@ class UsingActionsSnippets : FunSpec({ workflow( name = "Test workflow", on = listOf(Push()), - sourceFile = sourceTempFile.toPath(), + sourceFile = sourceTempFile, ) { job(id = "test_job", runsOn = RunnerType.UbuntuLatest) { uses( diff --git a/github-workflows-kt/src/test/kotlin/io/github/typesafegithub/workflows/dsl/JobBuilderTest.kt b/github-workflows-kt/src/test/kotlin/io/github/typesafegithub/workflows/dsl/JobBuilderTest.kt index 4db141352..eca3e134b 100644 --- a/github-workflows-kt/src/test/kotlin/io/github/typesafegithub/workflows/dsl/JobBuilderTest.kt +++ b/github-workflows-kt/src/test/kotlin/io/github/typesafegithub/workflows/dsl/JobBuilderTest.kt @@ -25,7 +25,7 @@ class JobBuilderTest : FunSpec({ workflow( name = "Test workflow", on = listOf(Push()), - sourceFile = Paths.get(".github/workflows/some_workflow.main.kts"), + sourceFile = Paths.get(".github/workflows/some_workflow.main.kts").toFile(), ) { job( id = "test_job", @@ -77,7 +77,7 @@ class JobBuilderTest : FunSpec({ workflow( name = "test", on = listOf(Push()), - sourceFile = sourceTempFile.toPath(), + sourceFile = sourceTempFile, ) { job(id = "test", runsOn = RunnerType.UbuntuLatest, condition = "a", `if` = "b") { run(command = "ls") @@ -92,7 +92,7 @@ class JobBuilderTest : FunSpec({ workflow( name = "test", on = listOf(Push()), - sourceFile = sourceTempFile.toPath(), + sourceFile = sourceTempFile, ) { job(id = "test", runsOn = RunnerType.UbuntuLatest, `if` = "b") { run(command = "ls") @@ -109,7 +109,7 @@ class JobBuilderTest : FunSpec({ workflow( name = "test", on = listOf(Push()), - sourceFile = sourceTempFile.toPath(), + sourceFile = sourceTempFile, ) { job(id = "test", runsOn = RunnerType.UbuntuLatest, condition = "b") { run(command = "ls") diff --git a/github-workflows-kt/src/test/kotlin/io/github/typesafegithub/workflows/dsl/WorkflowBuilderTest.kt b/github-workflows-kt/src/test/kotlin/io/github/typesafegithub/workflows/dsl/WorkflowBuilderTest.kt index 7a7c4c0f1..aa7d08e0d 100644 --- a/github-workflows-kt/src/test/kotlin/io/github/typesafegithub/workflows/dsl/WorkflowBuilderTest.kt +++ b/github-workflows-kt/src/test/kotlin/io/github/typesafegithub/workflows/dsl/WorkflowBuilderTest.kt @@ -15,7 +15,7 @@ class WorkflowBuilderTest : FunSpec({ workflow( name = "Some workflow", on = listOf(Push()), - sourceFile = Paths.get(".github/workflows/some_workflow.main.kts"), + sourceFile = Paths.get(".github/workflows/some_workflow.main.kts").toFile(), ) { // No jobs. } @@ -29,7 +29,7 @@ class WorkflowBuilderTest : FunSpec({ workflow( name = "Some workflow", on = listOf(Push()), - sourceFile = Paths.get(".github/workflows/some_workflow.main.kts"), + sourceFile = Paths.get(".github/workflows/some_workflow.main.kts").toFile(), ) { job( id = "Some-job", @@ -48,7 +48,7 @@ class WorkflowBuilderTest : FunSpec({ workflow( name = "Some workflow", on = emptyList(), - sourceFile = Paths.get(".github/workflows/some_workflow.main.kts"), + sourceFile = Paths.get(".github/workflows/some_workflow.main.kts").toFile(), ) { job( id = "Some job", @@ -70,7 +70,7 @@ class WorkflowBuilderTest : FunSpec({ workflow( name = "Some workflow", on = listOf(Push()), - sourceFile = Paths.get(".github/workflows/some_workflow.main.kts"), + sourceFile = Paths.get(".github/workflows/some_workflow.main.kts").toFile(), ) { job( id = "Some-job-1", diff --git a/images/teaser.svg b/images/teaser.svg index 7ad7e9d4e..5869a33c4 100644 --- a/images/teaser.svg +++ b/images/teaser.svg @@ -1,4 +1,4 @@ -