From 83583c681713b302a261efe09eefd13a4906c63c Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Fri, 16 Aug 2024 07:32:30 -0700 Subject: [PATCH 1/2] Update api diff during release automation --- .github/scripts/update-version.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/scripts/update-version.sh b/.github/scripts/update-version.sh index 452662de812c..924fb72defe6 100755 --- a/.github/scripts/update-version.sh +++ b/.github/scripts/update-version.sh @@ -21,3 +21,5 @@ sed -Ei "s/(opentelemetryJavaagentAlpha *: )\"[^\"]*\"/\1\"$alpha_version\"/" ex sed -Ei "s/(io.opentelemetry.instrumentation.muzzle-generation\" version )\"[^\"]*\"/\1\"$alpha_version\"/" examples/extension/build.gradle sed -Ei "s/(io.opentelemetry.instrumentation.muzzle-check\" version )\"[^\"]*\"/\1\"$alpha_version\"/" examples/extension/build.gradle + +sed -Ei "1 s/(Comparing source compatibility of [a-z-]+)-[0-9]+\.[0-9]+\.[0-9]+-SNAPSHOT.jar/\1-$version.jar/" docs/apidiffs/current_vs_latest/*.txt From 0191cf1f996b705f03418f6de3d775780aa1c4f7 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Fri, 16 Aug 2024 07:35:16 -0700 Subject: [PATCH 2/2] Handle non-SNAPSHOTs too --- .github/scripts/update-version.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/scripts/update-version.sh b/.github/scripts/update-version.sh index 924fb72defe6..748dc542adba 100755 --- a/.github/scripts/update-version.sh +++ b/.github/scripts/update-version.sh @@ -22,4 +22,4 @@ sed -Ei "s/(opentelemetryJavaagentAlpha *: )\"[^\"]*\"/\1\"$alpha_version\"/" ex sed -Ei "s/(io.opentelemetry.instrumentation.muzzle-generation\" version )\"[^\"]*\"/\1\"$alpha_version\"/" examples/extension/build.gradle sed -Ei "s/(io.opentelemetry.instrumentation.muzzle-check\" version )\"[^\"]*\"/\1\"$alpha_version\"/" examples/extension/build.gradle -sed -Ei "1 s/(Comparing source compatibility of [a-z-]+)-[0-9]+\.[0-9]+\.[0-9]+-SNAPSHOT.jar/\1-$version.jar/" docs/apidiffs/current_vs_latest/*.txt +sed -Ei "1 s/(Comparing source compatibility of [a-z-]+)-[0-9]+\.[0-9]+\.[0-9]+(-SNAPSHOT)?.jar/\1-$version.jar/" docs/apidiffs/current_vs_latest/*.txt