Skip to content

Commit 59626c0

Browse files
VampireVampire
committed
feat(abg)!: Allow to wire typed outputs to matching typed inputs
1 parent 3dcf646 commit 59626c0

File tree

38 files changed

+1447
-528
lines changed

38 files changed

+1447
-528
lines changed

‎.github/workflows/bindings-server.main.kts

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -79,25 +79,26 @@ workflow(
7979
}
8080
}
8181

82-
cleanMavenLocal()
82+
// TODO: Reenable after release, currently, new class "Expression" cannot be found
83+
//cleanMavenLocal()
8384

84-
run(
85-
name = "Execute the script using the bindings from the server",
86-
command = """
87-
mv .github/workflows/test-script-consuming-jit-bindings.main.do-not-compile.kts .github/workflows/test-script-consuming-jit-bindings.main.kts
88-
.github/workflows/test-script-consuming-jit-bindings.main.kts
89-
""".trimIndent(),
90-
)
85+
//run(
86+
// name = "Execute the script using the bindings from the server",
87+
// command = """
88+
// mv .github/workflows/test-script-consuming-jit-bindings.main.do-not-compile.kts .github/workflows/test-script-consuming-jit-bindings.main.kts
89+
// .github/workflows/test-script-consuming-jit-bindings.main.kts
90+
// """.trimIndent(),
91+
//)
9192

92-
cleanMavenLocal()
93+
//cleanMavenLocal()
9394

94-
run(
95-
name = "Execute the script using bindings but without dependency on library",
96-
command = """
97-
mv .github/workflows/test-served-bindings-depend-on-library.main.do-not-compile.kts .github/workflows/test-served-bindings-depend-on-library.main.kts
98-
.github/workflows/test-served-bindings-depend-on-library.main.kts
99-
""".trimIndent(),
100-
)
95+
//run(
96+
// name = "Execute the script using bindings but without dependency on library",
97+
// command = """
98+
// mv .github/workflows/test-served-bindings-depend-on-library.main.do-not-compile.kts .github/workflows/test-served-bindings-depend-on-library.main.kts
99+
// .github/workflows/test-served-bindings-depend-on-library.main.kts
100+
// """.trimIndent(),
101+
//)
101102

102103
run(
103104
name = "Fetch maven-metadata.xml for top-level action",

‎.github/workflows/bindings-server.yaml

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -46,25 +46,9 @@ jobs:
4646
GHWKT_GITHUB_CONTEXT_JSON: '${{ toJSON(github) }}'
4747
run: 'GHWKT_RUN_STEP=''end-to-end-test:step-3'' ''.github/workflows/bindings-server.main.kts'''
4848
- id: 'step-4'
49-
name: 'Clean Maven Local to fetch required POMs again'
50-
run: 'rm -rf ~/.m2/repository/'
51-
- id: 'step-5'
52-
name: 'Execute the script using the bindings from the server'
53-
run: |-
54-
mv .github/workflows/test-script-consuming-jit-bindings.main.do-not-compile.kts .github/workflows/test-script-consuming-jit-bindings.main.kts
55-
.github/workflows/test-script-consuming-jit-bindings.main.kts
56-
- id: 'step-6'
57-
name: 'Clean Maven Local to fetch required POMs again'
58-
run: 'rm -rf ~/.m2/repository/'
59-
- id: 'step-7'
60-
name: 'Execute the script using bindings but without dependency on library'
61-
run: |-
62-
mv .github/workflows/test-served-bindings-depend-on-library.main.do-not-compile.kts .github/workflows/test-served-bindings-depend-on-library.main.kts
63-
.github/workflows/test-served-bindings-depend-on-library.main.kts
64-
- id: 'step-8'
6549
name: 'Fetch maven-metadata.xml for top-level action'
6650
run: 'curl --fail http://localhost:8080/actions/checkout/maven-metadata.xml | grep ''<version>v4</version>'''
67-
- id: 'step-9'
51+
- id: 'step-5'
6852
name: 'Fetch maven-metadata.xml for nested action'
6953
run: 'curl --fail http://localhost:8080/actions/cache__save/maven-metadata.xml | grep ''<version>v4</version>'''
7054
deploy:

‎.github/workflows/end-to-end-tests.main.kts

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import io.github.typesafegithub.workflows.actions.actions.*
1515
import io.github.typesafegithub.workflows.actions.gradle.ActionsSetupGradle
1616
import io.github.typesafegithub.workflows.actions.wandalen.WretryAction
1717
import io.github.typesafegithub.workflows.annotations.ExperimentalKotlinLogicStep
18+
import io.github.typesafegithub.workflows.domain.Expression
1819
import io.github.typesafegithub.workflows.domain.JobOutputs
1920
import io.github.typesafegithub.workflows.domain.Mode
2021
import io.github.typesafegithub.workflows.domain.Permission
@@ -81,9 +82,9 @@ workflow(
8182
Permission.Contents to Mode.None,
8283
),
8384
outputs = object : JobOutputs() {
84-
var scriptKey by output()
85-
var scriptKey2 by output()
86-
var scriptResult by output()
85+
var scriptKey by output<String>()
86+
var scriptKey2 by output<String>()
87+
var scriptResult by output<String>()
8788
},
8889
) {
8990
run(
@@ -179,7 +180,7 @@ workflow(
179180
name = "Some step consuming other step's output",
180181
action = Checkout(
181182
sshKey = expr(addAndCommit.outputs.pythonVersion),
182-
path = expr(addAndCommit.outputs["my-unsafe-output"]),
183+
path = addAndCommit.outputs["my-unsafe-output"].expressionString,
183184
),
184185
)
185186

@@ -234,7 +235,7 @@ workflow(
234235
)
235236
jobOutputs.scriptKey = scriptStep.outputs["key"]
236237
jobOutputs.scriptKey2 = scriptStep.outputs["key2"]
237-
jobOutputs.scriptResult = scriptStep.outputs.result
238+
jobOutputs.scriptResult = Expression(scriptStep.outputs.result)
238239
}
239240

240241
job(
@@ -250,9 +251,9 @@ workflow(
250251
run(
251252
name = "use output of script",
252253
command = """
253-
echo ${expr { testJob1.outputs.scriptKey }}
254-
echo ${expr { testJob1.outputs.scriptKey2 }}
255-
echo ${expr { testJob1.outputs.scriptResult }}
254+
echo ${testJob1.outputs.scriptKey.expressionString}
255+
echo ${expr(testJob1.outputs.scriptKey2.expression)}
256+
echo ${expr { testJob1.outputs.scriptResult.expression }}
256257
""".trimIndent(),
257258
)
258259

‎action-binding-generator/api/action-binding-generator.api

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,23 @@ public final class io/github/typesafegithub/workflows/actionbindinggenerator/dom
2323
public static final fun isTopLevel (Lio/github/typesafegithub/workflows/actionbindinggenerator/domain/ActionCoords;)Z
2424
}
2525

26+
public final class io/github/typesafegithub/workflows/actionbindinggenerator/domain/ActionTypings {
27+
public fun <init> ()V
28+
public fun <init> (Ljava/util/Map;Ljava/util/Map;Lio/github/typesafegithub/workflows/actionbindinggenerator/domain/TypingActualSource;)V
29+
public synthetic fun <init> (Ljava/util/Map;Ljava/util/Map;Lio/github/typesafegithub/workflows/actionbindinggenerator/domain/TypingActualSource;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
30+
public final fun component1 ()Ljava/util/Map;
31+
public final fun component2 ()Ljava/util/Map;
32+
public final fun component3 ()Lio/github/typesafegithub/workflows/actionbindinggenerator/domain/TypingActualSource;
33+
public final fun copy (Ljava/util/Map;Ljava/util/Map;Lio/github/typesafegithub/workflows/actionbindinggenerator/domain/TypingActualSource;)Lio/github/typesafegithub/workflows/actionbindinggenerator/domain/ActionTypings;
34+
public static synthetic fun copy$default (Lio/github/typesafegithub/workflows/actionbindinggenerator/domain/ActionTypings;Ljava/util/Map;Ljava/util/Map;Lio/github/typesafegithub/workflows/actionbindinggenerator/domain/TypingActualSource;ILjava/lang/Object;)Lio/github/typesafegithub/workflows/actionbindinggenerator/domain/ActionTypings;
35+
public fun equals (Ljava/lang/Object;)Z
36+
public final fun getInputTypings ()Ljava/util/Map;
37+
public final fun getOutputTypings ()Ljava/util/Map;
38+
public final fun getSource ()Lio/github/typesafegithub/workflows/actionbindinggenerator/domain/TypingActualSource;
39+
public fun hashCode ()I
40+
public fun toString ()Ljava/lang/String;
41+
}
42+
2643
public final class io/github/typesafegithub/workflows/actionbindinggenerator/domain/CommitHash : io/github/typesafegithub/workflows/actionbindinggenerator/domain/MetadataRevision {
2744
public fun <init> (Ljava/lang/String;)V
2845
public final fun component1 ()Ljava/lang/String;
@@ -72,8 +89,8 @@ public final class io/github/typesafegithub/workflows/actionbindinggenerator/gen
7289
}
7390

7491
public final class io/github/typesafegithub/workflows/actionbindinggenerator/generation/GenerationKt {
75-
public static final fun generateBinding (Lio/github/typesafegithub/workflows/actionbindinggenerator/domain/ActionCoords;Lio/github/typesafegithub/workflows/actionbindinggenerator/domain/MetadataRevision;Lio/github/typesafegithub/workflows/actionbindinggenerator/metadata/Metadata;Lkotlin/Pair;)Ljava/util/List;
76-
public static synthetic fun generateBinding$default (Lio/github/typesafegithub/workflows/actionbindinggenerator/domain/ActionCoords;Lio/github/typesafegithub/workflows/actionbindinggenerator/domain/MetadataRevision;Lio/github/typesafegithub/workflows/actionbindinggenerator/metadata/Metadata;Lkotlin/Pair;ILjava/lang/Object;)Ljava/util/List;
92+
public static final fun generateBinding (Lio/github/typesafegithub/workflows/actionbindinggenerator/domain/ActionCoords;Lio/github/typesafegithub/workflows/actionbindinggenerator/domain/MetadataRevision;Lio/github/typesafegithub/workflows/actionbindinggenerator/metadata/Metadata;Lio/github/typesafegithub/workflows/actionbindinggenerator/domain/ActionTypings;)Ljava/util/List;
93+
public static synthetic fun generateBinding$default (Lio/github/typesafegithub/workflows/actionbindinggenerator/domain/ActionCoords;Lio/github/typesafegithub/workflows/actionbindinggenerator/domain/MetadataRevision;Lio/github/typesafegithub/workflows/actionbindinggenerator/metadata/Metadata;Lio/github/typesafegithub/workflows/actionbindinggenerator/domain/ActionTypings;ILjava/lang/Object;)Ljava/util/List;
7794
}
7895

7996
public final class io/github/typesafegithub/workflows/actionbindinggenerator/metadata/Input {

‎action-binding-generator/src/main/kotlin/io/github/typesafegithub/workflows/actionbindinggenerator/domain/ActionTypings.kt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
package io.github.typesafegithub.workflows.actionbindinggenerator.domain
2+
3+
import io.github.typesafegithub.workflows.actionbindinggenerator.typing.Typing
4+
5+
public data class ActionTypings(
6+
val inputTypings: Map<String, Typing> = emptyMap(),
7+
val outputTypings: Map<String, Typing> = emptyMap(),
8+
val source: TypingActualSource? = null,
9+
)

0 commit comments

Comments
 (0)