Skip to content

Commit 1239cdc

Browse files
VampireVampire
committed
feat(abg)!: allow to wire typed outputs to matching typed inputs
1 parent e788dc0 commit 1239cdc

File tree

47 files changed

+1730
-547
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+1730
-547
lines changed

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

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -106,15 +106,16 @@ workflow(
106106
""".trimIndent(),
107107
)
108108

109-
cleanMavenLocal()
110-
111-
run(
112-
name = "Execute the script using the bindings from the server with v2 route",
113-
command = """
114-
mv .github/workflows/test-script-consuming-jit-bindings-v2.main.do-not-compile.kts .github/workflows/test-script-consuming-jit-bindings-v2.main.kts
115-
.github/workflows/test-script-consuming-jit-bindings-v2.main.kts
116-
""".trimIndent(),
117-
)
109+
// TODO: Reenable after release, currently, new class "Expression" cannot be found
110+
//cleanMavenLocal()
111+
112+
//run(
113+
// name = "Execute the script using the bindings from the server with v2 route",
114+
// command = """
115+
// mv .github/workflows/test-script-consuming-jit-bindings-v2.main.do-not-compile.kts .github/workflows/test-script-consuming-jit-bindings-v2.main.kts
116+
// .github/workflows/test-script-consuming-jit-bindings-v2.main.kts
117+
// """.trimIndent(),
118+
//)
118119

119120
cleanMavenLocal()
120121

‎.github/workflows/bindings-server.yaml

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -84,57 +84,49 @@ jobs:
8484
name: 'Clean Maven Local to fetch required POMs again'
8585
run: 'rm -rf ~/.m2/repository/'
8686
- id: 'step-9'
87-
name: 'Execute the script using the bindings from the server with v2 route'
88-
run: |-
89-
mv .github/workflows/test-script-consuming-jit-bindings-v2.main.do-not-compile.kts .github/workflows/test-script-consuming-jit-bindings-v2.main.kts
90-
.github/workflows/test-script-consuming-jit-bindings-v2.main.kts
91-
- id: 'step-10'
92-
name: 'Clean Maven Local to fetch required POMs again'
93-
run: 'rm -rf ~/.m2/repository/'
94-
- id: 'step-11'
9587
name: 'Execute the script using bindings but without dependency on library'
9688
run: |-
9789
mv .github/workflows/test-served-bindings-depend-on-library.main.do-not-compile.kts .github/workflows/test-served-bindings-depend-on-library.main.kts
9890
.github/workflows/test-served-bindings-depend-on-library.main.kts
99-
- id: 'step-12'
91+
- id: 'step-10'
10092
name: 'Install Kotlin 1.9.0'
10193
uses: 'fwilhe2/setup-kotlin@v1'
10294
with:
10395
version: '1.9.0'
104-
- id: 'step-13'
96+
- id: 'step-11'
10597
name: 'Clean Maven Local to fetch required POMs again'
10698
run: 'rm -rf ~/.m2/repository/'
107-
- id: 'step-14'
99+
- id: 'step-12'
108100
name: 'Execute the script using the bindings from the server, using older Kotlin (1.9.0) as consumer'
109101
run: |2-
110102
cp .github/workflows/test-script-consuming-jit-bindings.main.kts .github/workflows/test-script-consuming-jit-bindings-too-old-kotlin.main.kts
111103
(.github/workflows/test-script-consuming-jit-bindings-too-old-kotlin.main.kts || true) >> output.txt 2>&1
112104
grep "was compiled with an incompatible version of Kotlin" output.txt
113-
- id: 'step-15'
105+
- id: 'step-13'
114106
name: 'Install Kotlin 2.0.0'
115107
uses: 'fwilhe2/setup-kotlin@v1'
116108
with:
117109
version: '2.0.0'
118-
- id: 'step-16'
110+
- id: 'step-14'
119111
name: 'Clean Maven Local to fetch required POMs again'
120112
run: 'rm -rf ~/.m2/repository/'
121-
- id: 'step-17'
113+
- id: 'step-15'
122114
name: 'Execute the script using the bindings from the server, using older Kotlin (2.0.0) as consumer'
123115
run: |-
124116
cp .github/workflows/test-script-consuming-jit-bindings.main.kts .github/workflows/test-script-consuming-jit-bindings-older-kotlin.main.kts
125117
.github/workflows/test-script-consuming-jit-bindings-older-kotlin.main.kts
126-
- id: 'step-18'
118+
- id: 'step-16'
127119
name: 'Compile a Gradle project using the bindings from the server'
128120
run: |-
129121
cd .github/workflows/test-gradle-project-using-bindings-server
130122
./gradlew build
131-
- id: 'step-19'
123+
- id: 'step-17'
132124
name: 'Fetch maven-metadata.xml for top-level action'
133125
run: 'curl --fail http://localhost:8080/actions/checkout/maven-metadata.xml | grep ''<version>v4</version>'''
134-
- id: 'step-20'
126+
- id: 'step-18'
135127
name: 'Fetch maven-metadata.xml for nested action'
136128
run: 'curl --fail http://localhost:8080/actions/cache__save/maven-metadata.xml | grep ''<version>v4</version>'''
137-
- id: 'step-21'
129+
- id: 'step-19'
138130
name: 'Print server logs'
139131
run: 'cat jit-binding-server/logs/server.log'
140132
if: '${{ always() }}'

‎.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

@@ -247,7 +248,7 @@ workflow(
247248
)
248249
jobOutputs.scriptKey = scriptStep.outputs["key"]
249250
jobOutputs.scriptKey2 = scriptStep.outputs["key2"]
250-
jobOutputs.scriptResult = scriptStep.outputs.result
251+
jobOutputs.scriptResult = Expression(scriptStep.outputs.result)
251252
}
252253

253254
job(
@@ -263,9 +264,9 @@ workflow(
263264
run(
264265
name = "use output of script",
265266
command = """
266-
echo ${expr { testJob1.outputs.scriptKey }}
267-
echo ${expr { testJob1.outputs.scriptKey2 }}
268-
echo ${expr { testJob1.outputs.scriptResult }}
267+
echo ${testJob1.outputs.scriptKey.expressionString}
268+
echo ${expr(testJob1.outputs.scriptKey2.expression)}
269+
echo ${expr { testJob1.outputs.scriptResult.expression }}
269270
""".trimIndent(),
270271
)
271272

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

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

29+
public final class io/github/typesafegithub/workflows/actionbindinggenerator/domain/ActionTypings {
30+
public fun <init> ()V
31+
public fun <init> (Ljava/util/Map;Ljava/util/Map;Lio/github/typesafegithub/workflows/actionbindinggenerator/domain/TypingActualSource;)V
32+
public synthetic fun <init> (Ljava/util/Map;Ljava/util/Map;Lio/github/typesafegithub/workflows/actionbindinggenerator/domain/TypingActualSource;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
33+
public final fun component1 ()Ljava/util/Map;
34+
public final fun component2 ()Ljava/util/Map;
35+
public final fun component3 ()Lio/github/typesafegithub/workflows/actionbindinggenerator/domain/TypingActualSource;
36+
public final fun copy (Ljava/util/Map;Ljava/util/Map;Lio/github/typesafegithub/workflows/actionbindinggenerator/domain/TypingActualSource;)Lio/github/typesafegithub/workflows/actionbindinggenerator/domain/ActionTypings;
37+
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;
38+
public fun equals (Ljava/lang/Object;)Z
39+
public final fun getInputTypings ()Ljava/util/Map;
40+
public final fun getOutputTypings ()Ljava/util/Map;
41+
public final fun getSource ()Lio/github/typesafegithub/workflows/actionbindinggenerator/domain/TypingActualSource;
42+
public fun hashCode ()I
43+
public fun toString ()Ljava/lang/String;
44+
}
45+
2946
public final class io/github/typesafegithub/workflows/actionbindinggenerator/domain/CommitHash : io/github/typesafegithub/workflows/actionbindinggenerator/domain/MetadataRevision {
3047
public fun <init> (Ljava/lang/String;)V
3148
public final fun component1 ()Ljava/lang/String;
@@ -85,8 +102,8 @@ public final class io/github/typesafegithub/workflows/actionbindinggenerator/gen
85102
}
86103

87104
public final class io/github/typesafegithub/workflows/actionbindinggenerator/generation/GenerationKt {
88-
public static final fun generateBinding (Lio/github/typesafegithub/workflows/actionbindinggenerator/domain/ActionCoords;Lio/github/typesafegithub/workflows/actionbindinggenerator/versioning/BindingVersion;Lio/github/typesafegithub/workflows/actionbindinggenerator/domain/MetadataRevision;Lio/github/typesafegithub/workflows/actionbindinggenerator/metadata/Metadata;Lkotlin/Pair;)Ljava/util/List;
89-
public static synthetic fun generateBinding$default (Lio/github/typesafegithub/workflows/actionbindinggenerator/domain/ActionCoords;Lio/github/typesafegithub/workflows/actionbindinggenerator/versioning/BindingVersion;Lio/github/typesafegithub/workflows/actionbindinggenerator/domain/MetadataRevision;Lio/github/typesafegithub/workflows/actionbindinggenerator/metadata/Metadata;Lkotlin/Pair;ILjava/lang/Object;)Ljava/util/List;
105+
public static final fun generateBinding (Lio/github/typesafegithub/workflows/actionbindinggenerator/domain/ActionCoords;Lio/github/typesafegithub/workflows/actionbindinggenerator/versioning/BindingVersion;Lio/github/typesafegithub/workflows/actionbindinggenerator/domain/MetadataRevision;Lio/github/typesafegithub/workflows/actionbindinggenerator/metadata/Metadata;Lio/github/typesafegithub/workflows/actionbindinggenerator/domain/ActionTypings;)Ljava/util/List;
106+
public static synthetic fun generateBinding$default (Lio/github/typesafegithub/workflows/actionbindinggenerator/domain/ActionCoords;Lio/github/typesafegithub/workflows/actionbindinggenerator/versioning/BindingVersion;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;
90107
}
91108

92109
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)