From e6c6dded91fe19faa097343b6236106d8f4ce961 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Kautler?= <Bjoern@Kautler.net>
Date: Mon, 19 Aug 2024 15:48:05 +0200
Subject: [PATCH 1/2] fix(abg): use correct coordinates in generated POM file

---
 .../github/typesafegithub/workflows/mavenbinding/PomBuilding.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/maven-binding-builder/src/main/kotlin/io/github/typesafegithub/workflows/mavenbinding/PomBuilding.kt b/maven-binding-builder/src/main/kotlin/io/github/typesafegithub/workflows/mavenbinding/PomBuilding.kt
index de62de9be5..9ddfe024ab 100644
--- a/maven-binding-builder/src/main/kotlin/io/github/typesafegithub/workflows/mavenbinding/PomBuilding.kt
+++ b/maven-binding-builder/src/main/kotlin/io/github/typesafegithub/workflows/mavenbinding/PomBuilding.kt
@@ -12,7 +12,7 @@ internal fun ActionCoords.buildPomFile() =
     <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">
       <modelVersion>4.0.0</modelVersion>
       <groupId>$owner</groupId>
-      <artifactId>$fullName</artifactId>
+      <artifactId>$mavenName</artifactId>
       <version>$version</version>
       <name>$fullName</name>
       <description>Auto-generated binding for $prettyPrint.</description>

From ab70e5597b264113f30a84ff29a634341e2e19bf Mon Sep 17 00:00:00 2001
From: Piotr Krzeminski <git@krzeminski.it>
Date: Sun, 27 Oct 2024 23:02:29 +0100
Subject: [PATCH 2/2] Adjust test

---
 .github/workflows/bindings-server.main.kts | 7 +------
 .github/workflows/bindings-server.yaml     | 3 +--
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/bindings-server.main.kts b/.github/workflows/bindings-server.main.kts
index 242ef63b5b..478fc43941 100755
--- a/.github/workflows/bindings-server.main.kts
+++ b/.github/workflows/bindings-server.main.kts
@@ -103,14 +103,9 @@ workflow(
 
         run(
             name = "Compile a Gradle project using the bindings from the server",
-            // This test depicts the current incorrect behavior, and asserts on
-            // the Gradle build failing with a specific problem. Once the problem
-            // is fixed, modify the test to assert on a successful build.
-            // TODO: https://github.com/typesafegithub/github-workflows-kt/issues/1694
             command = """
                 cd .github/workflows/test-gradle-project-using-bindings-server
-                (./gradlew build || true) >> output.txt 2>&1
-                grep "inconsistent module metadata" output.txt
+                ./gradlew build
             """.trimIndent(),
         )
 
diff --git a/.github/workflows/bindings-server.yaml b/.github/workflows/bindings-server.yaml
index 6b2901da92..82647f85b0 100644
--- a/.github/workflows/bindings-server.yaml
+++ b/.github/workflows/bindings-server.yaml
@@ -68,8 +68,7 @@ jobs:
       name: 'Compile a Gradle project using the bindings from the server'
       run: |-
         cd .github/workflows/test-gradle-project-using-bindings-server
-        (./gradlew build || true) >> output.txt 2>&1
-        grep "inconsistent module metadata" output.txt
+        ./gradlew build
     - id: 'step-10'
       name: 'Fetch maven-metadata.xml for top-level action'
       run: 'curl --fail http://localhost:8080/actions/checkout/maven-metadata.xml | grep ''<version>v4</version>'''