From c8e82942e037908ff519fdc084d637272eb7449c Mon Sep 17 00:00:00 2001 From: Jack Berg Date: Mon, 27 Jan 2025 14:44:09 -0600 Subject: [PATCH 1/2] Tweak rc workflow steps --- RELEASING.md | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/RELEASING.md b/RELEASING.md index b178a934..8b6a7d06 100644 --- a/RELEASING.md +++ b/RELEASING.md @@ -44,11 +44,18 @@ the `semantic-convention` release version, e.g. `v1.21.0.1` * `export GPG_PASSWORD=` * `export SONATYPE_USER=` * `export SONATYPE_KEY=` +* Set `snapshot = false` in [build.gradle.kts](./build.gradle.kts): + + ``` + // start - updated by ./.github/workflows/prepare-release-branch.yml + val snapshot = false // <-- UPDATE THIS LINE + // end + ``` + * Adjust version tag to include `-rc.` suffix (i.e. `-rc.1` for the first release candidate) in [build.gradle.kts](./build.gradle.kts): ``` var ver = semanticConventionsVersion - ver += "-rc.1" // <-- ADD THIS LINE val release = findProperty("otel.release") if (release != null) { ver += "-" + release @@ -56,6 +63,7 @@ the `semantic-convention` release version, e.g. `v1.21.0.1` if (snapshot) { ver += "-SNAPSHOT" } + ver += "-rc.1" // <-- ADD THIS LINE version = ver ``` From e5179b4c339e55c4783c92400f3d3bb75b6c22c0 Mon Sep 17 00:00:00 2001 From: Jack Berg Date: Mon, 27 Jan 2025 14:56:02 -0600 Subject: [PATCH 2/2] Remove snapshot, remove changelog entry with date --- CHANGELOG.md | 2 -- RELEASING.md | 8 -------- 2 files changed, 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8b096271..c48255e0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,8 +2,6 @@ ## Unreleased -## Version 1.30.0-RC (2025-01-27) - **NOTICE**: This is a release candidate (RC), preceding the first stable release of `io.opentelemetry.semconv:opentelemetry-semconv`. * **BREAKING**: Prepare for stable release. Remove deprecated `ResourceAttributes`, `SemanticAttributes`. diff --git a/RELEASING.md b/RELEASING.md index 8b6a7d06..5127f8b3 100644 --- a/RELEASING.md +++ b/RELEASING.md @@ -44,14 +44,6 @@ the `semantic-convention` release version, e.g. `v1.21.0.1` * `export GPG_PASSWORD=` * `export SONATYPE_USER=` * `export SONATYPE_KEY=` -* Set `snapshot = false` in [build.gradle.kts](./build.gradle.kts): - - ``` - // start - updated by ./.github/workflows/prepare-release-branch.yml - val snapshot = false // <-- UPDATE THIS LINE - // end - ``` - * Adjust version tag to include `-rc.` suffix (i.e. `-rc.1` for the first release candidate) in [build.gradle.kts](./build.gradle.kts): ```