From 216a8fdf99150c1007978a2feabf7ffcf09ab8fe Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Mon, 20 Oct 2025 15:19:34 -0700 Subject: [PATCH 1/2] Fix apidiff CI verification --- .../src/main/kotlin/otel.japicmp-conventions.gradle.kts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conventions/src/main/kotlin/otel.japicmp-conventions.gradle.kts b/conventions/src/main/kotlin/otel.japicmp-conventions.gradle.kts index ce300386521e..63f927ed4520 100644 --- a/conventions/src/main/kotlin/otel.japicmp-conventions.gradle.kts +++ b/conventions/src/main/kotlin/otel.japicmp-conventions.gradle.kts @@ -101,8 +101,8 @@ if (project.findProperty("otel.stable") == "true") { ?: file("$rootDir/docs/apidiffs/current_vs_$baseVersionString/${base.archivesName.get()}.txt") ) } - // have the jApiCmp task run every time the jar task is run, to make it more likely it will get used. - named("jar") { + // have the check task depend on the api comparison task, to make it more likely it will get used. + named("check") { finalizedBy(jApiCmp) } } From 70770a708be2c7851dcb2a6c4270b92766f0e06a Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Mon, 20 Oct 2025 15:41:01 -0700 Subject: [PATCH 2/2] Exclude javaagent --- conventions/src/main/kotlin/otel.japicmp-conventions.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conventions/src/main/kotlin/otel.japicmp-conventions.gradle.kts b/conventions/src/main/kotlin/otel.japicmp-conventions.gradle.kts index 63f927ed4520..8fdfae89172d 100644 --- a/conventions/src/main/kotlin/otel.japicmp-conventions.gradle.kts +++ b/conventions/src/main/kotlin/otel.japicmp-conventions.gradle.kts @@ -49,7 +49,7 @@ fun findArtifact(version: String): File { } // generate the api diff report for any module that is stable -if (project.findProperty("otel.stable") == "true") { +if (project.findProperty("otel.stable") == "true" && project.path != ":javaagent") { afterEvaluate { // Only apply japicmp to projects that have a jar task (i.e. not BOMs or platforms) tasks.findByName("jar")?.let {