Skip to content

Commit 709955f

Browse files
Vampirekrzema12
andauthored
fix(server): use correct coordinates in generated POM file (#1609)
Fixes #1694. Co-authored-by: Piotr Krzeminski <[email protected]>
1 parent 5014da0 commit 709955f

File tree

3 files changed

+3
-9
lines changed

3 files changed

+3
-9
lines changed

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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -103,14 +103,9 @@ workflow(
103103

104104
run(
105105
name = "Compile a Gradle project using the bindings from the server",
106-
// This test depicts the current incorrect behavior, and asserts on
107-
// the Gradle build failing with a specific problem. Once the problem
108-
// is fixed, modify the test to assert on a successful build.
109-
// TODO: https://github.com/typesafegithub/github-workflows-kt/issues/1694
110106
command = """
111107
cd .github/workflows/test-gradle-project-using-bindings-server
112-
(./gradlew build || true) >> output.txt 2>&1
113-
grep "inconsistent module metadata" output.txt
108+
./gradlew build
114109
""".trimIndent(),
115110
)
116111

.github/workflows/bindings-server.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,7 @@ jobs:
6868
name: 'Compile a Gradle project using the bindings from the server'
6969
run: |-
7070
cd .github/workflows/test-gradle-project-using-bindings-server
71-
(./gradlew build || true) >> output.txt 2>&1
72-
grep "inconsistent module metadata" output.txt
71+
./gradlew build
7372
- id: 'step-10'
7473
name: 'Fetch maven-metadata.xml for top-level action'
7574
run: 'curl --fail http://localhost:8080/actions/checkout/maven-metadata.xml | grep ''<version>v4</version>'''

maven-binding-builder/src/main/kotlin/io/github/typesafegithub/workflows/mavenbinding/PomBuilding.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ internal fun ActionCoords.buildPomFile() =
1212
<project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
1313
<modelVersion>4.0.0</modelVersion>
1414
<groupId>$owner</groupId>
15-
<artifactId>$fullName</artifactId>
15+
<artifactId>$mavenName</artifactId>
1616
<version>$version</version>
1717
<name>$fullName</name>
1818
<description>Auto-generated binding for $prettyPrint.</description>

0 commit comments

Comments
 (0)