From 4726147ea07fdd024d657ed6abd308baa2979e07 Mon Sep 17 00:00:00 2001 From: jack-berg Date: Thu, 14 Mar 2024 15:31:14 -0500 Subject: [PATCH] Encode semconv version in build dir to fix build cache --- build.gradle.kts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 11cbc3e..f85b962 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -56,7 +56,7 @@ val schemaUrl = "https://opentelemetry.io/schemas/$semanticConventionsVersion" val downloadSemanticConventions by tasks.registering(Download::class) { src(semanticConventionsRepoZip) - dest("$buildDir/semantic-conventions/semantic-conventions.zip") + dest("$buildDir/semantic-conventions-${semanticConventionsVersion}/semantic-conventions.zip") overwrite(false) } @@ -69,7 +69,7 @@ val unzipConfigurationSchema by tasks.registering(Copy::class) { val pathParts = path.split("/") path = pathParts.subList(1, pathParts.size).joinToString("/") }) - into("$buildDir/semantic-conventions/") + into("$buildDir/semantic-conventions-${semanticConventionsVersion}/") } fun generateTask(taskName: String, incubating: Boolean) { @@ -88,7 +88,7 @@ fun generateTask(taskName: String, incubating: Boolean) { setArgs(listOf( "run", "--rm", - "-v", "$buildDir/semantic-conventions/model:/source", + "-v", "$buildDir/semantic-conventions-${semanticConventionsVersion}/model:/source", "-v", "$projectDir/buildscripts/templates:/templates", "-v", "$projectDir/$outputDir:/output", "otel/semconvgen:$generatorVersion",