Skip to content

Commit fc8ed8f

Browse files
authored
move main to next minor release (#4960)
1 parent 51107ca commit fc8ed8f

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ Main (unreleased)
3434
- (_Public Preview_) Additions to `database_observability.mysql` component:
3535
- replace the internal `server_id` label attribution in favor of a hash composed from `@@server_uuid` and `@@hostname`
3636

37-
v1.12.0-rc.3
37+
v1.12.0
3838
-----------------
3939

4040
### Breaking changes

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,4 @@
2020
#
2121
# Lines starting with "#" and blank lines are ignored.
2222

23-
v1.12.0
23+
v1.13.0

docs/developer/release/02-update-version-in-code.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,12 +80,12 @@ For an Additional Release Candidate or SRV, update the header `PREVIOUS_RELEASE_
8080

8181
### 2.2. Update the VERSION file
8282

83-
The [VERSION file][VERSION-file] on the "main" branch should point to the next major version.
83+
The [VERSION file][VERSION-file] on the "main" branch should point to the next minor version.
8484
For example:
8585
* If you are going to release `v1.2.0-rc.0`, then the VERSION file should contain `v1.3.0`.
8686
* If you are going to release `v1.5.1`, then the VERSION file should contain `v1.6.0`.
8787

88-
The reasoning behind this is that any builds of the main branch should contain the next major version they are meant to go to.
88+
The reasoning behind this is that any builds of the main branch should contain the next minor version they are meant to go to.
8989
If the latest release branch that was cut is `release/1.3`, then `main` is preparing for `1.4.0`.
9090
Any builds of the main branch will therefore be labeled `devel-1.4.0`.
9191

docs/sources/_index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ title: Grafana Alloy
44
description: Grafana Alloy is a vendor-neutral distribution of the OTel Collector
55
weight: 350
66
cascade:
7-
ALLOY_RELEASE: v1.12.0
7+
ALLOY_RELEASE: v1.13.0
88
OTEL_VERSION: v0.139.0
99
PROM_WIN_EXP_VERSION: v0.31.3
1010
SNMP_VERSION: v0.29.0

0 commit comments

Comments
 (0)