Skip to content

Commit

Permalink
[release/v1.38.x] Fix incorrect SDK version included in release notes (
Browse files Browse the repository at this point in the history
…#1428)

Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
  • Loading branch information
opentelemetrybot and trask authored Aug 19, 2024
1 parent 25efd3c commit 4c22b8b
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
5 changes: 4 additions & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -132,10 +132,13 @@ jobs:
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
instrumentation_version=$(grep -Po "val otelInstrumentationVersion = \"\K[0-9]+.[0-9]+.[0-9]+" dependencyManagement/build.gradle.kts)
# conditional blocks not indented because of the heredoc
if [[ $VERSION == *.0 ]]; then
cat > /tmp/release-notes.txt << EOF
This release targets the OpenTelemetry SDK $VERSION.
This release targets the OpenTelemetry Java Instrumentation
[$instrumentation_version](https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/tag/v$instrumentation_version).
EOF
else
Expand Down
4 changes: 3 additions & 1 deletion dependencyManagement/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,15 @@ data class DependencySet(val group: String, val version: String, val modules: Li
val dependencyVersions = hashMapOf<String, String>()
rootProject.extra["versions"] = dependencyVersions

val otelInstrumentationVersion = "2.7.0-alpha"

val DEPENDENCY_BOMS = listOf(
"com.fasterxml.jackson:jackson-bom:2.17.2",
"com.google.guava:guava-bom:33.3.0-jre",
"com.linecorp.armeria:armeria-bom:1.30.0",
"org.junit:junit-bom:5.11.0",
"io.grpc:grpc-bom:1.66.0",
"io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.7.0-alpha",
"io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:${otelInstrumentationVersion}",
"org.testcontainers:testcontainers-bom:1.20.1"
)

Expand Down

0 comments on commit 4c22b8b

Please sign in to comment.