Skip to content

Commit 47aae5c

Browse files
committed
Merge branch 'main' into clean-up-dep-versions
2 parents 6f74f30 + 8bbcd98 commit 47aae5c

4 files changed

Lines changed: 6 additions & 8 deletions

File tree

.github/workflows/release-all.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ jobs:
118118
secrets: inherit
119119

120120
bump-main:
121-
needs: [enumerate, publish]
121+
needs: [enumerate, publish, finalize]
122122
if: always() && needs.enumerate.result == 'success'
123123
permissions:
124124
contents: write

RELEASING.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,9 @@ rest of the workspace is not ready for a bulk release.
6767

6868
## Patch release (current minor line)
6969

70+
> [!NOTE]
71+
> This only works if the `major.minor` version on `main` is the same version you want to patch (i.e., before the post-release bump PR to the next minor version is merged). Once `main` is bumped to the next minor dev version, all patch releases for the older minor version must use the backport workflow instead.
72+
7073
1. Land the fix on `main` as a normal PR (with a towncrier fragment).
7174
2. Run
7275
[`Prepare package patch release`](./.github/workflows/prepare-package-patch.yml)
Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
11
# Copyright The OpenTelemetry Authors
22
# SPDX-License-Identifier: Apache-2.0
33

4-
# **IMPORTANT**:
5-
#
6-
# This version should stay below "1.0" until the fundamentals
7-
# in "TODOS.md" have been addressed. Please revisit the TODOs
8-
# listed there before bumping to a stable version.
9-
__version__ = "1.0b0"
4+
__version__ = "1.1b0.dev"
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# Copyright The OpenTelemetry Authors
22
# SPDX-License-Identifier: Apache-2.0
33

4-
__version__ = "1.0b0"
4+
__version__ = "1.1b0.dev"

0 commit comments

Comments
 (0)