Skip to content

Conversation

@v1v
Copy link
Member

@v1v v1v commented Oct 1, 2025

Motivation/summary

For some reason the github-actions[bot] is used instead of the specific github token.

Hence the branch protections don't allow running things

image

Checklist

For functional changes, consider:

  • Is it observable through the addition of either logging or metrics?
  • Is its use being published in telemetry to enable product improvement?
  • Have system tests been added to avoid regression?

How to test these changes

Related issues

@v1v v1v requested review from a team as code owners October 1, 2025 11:45
@github-actions
Copy link
Contributor

github-actions bot commented Oct 1, 2025

🤖 GitHub comments

Expand to view the GitHub comments

Just comment with:

  • run docs-build : Re-trigger the docs validation. (use unformatted text in the comment!)

@mergify
Copy link
Contributor

mergify bot commented Oct 1, 2025

This pull request does not have a backport label. Could you fix it @v1v? 🙏
To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

  • backport-7.17 is the label to automatically backport to the 7.17 branch.
  • backport-8./d is the label to automatically backport to the 8./d branch. /d is the digit.
  • backport-9./d is the label to automatically backport to the 9./d branch. /d is the digit.
  • backport-active-all is the label that automatically backports to all active branches.
  • backport-active-8 is the label that automatically backports to all active minor branches for the 8 major.
  • backport-active-9 is the label that automatically backports to all active minor branches for the 9 major.

@v1v
Copy link
Member Author

v1v commented Oct 1, 2025

Test

 apm-server git:(main) make minor-release PROJECT_OWNER=v1v RELEASE_BRANCH=9.2 RELEASE_TYPE=minor RELEASE_VERSION=9.2.0
INFO: Create GitHub label backport for the version 9.2.0
::group::create-github-label backport-9.2
✓ Label "backport-9.2" created in v1v/apm-server
::endgroup::
INFO: Create release branch and update new version 9.2.0
::group::create-branch 9.2
Already on 'main'
Your branch is up to date with 'origin/main'.
Switched to a new branch '9.2'
::endgroup::
>> update-version
>> update-version-makefile
::group::git-diff
diff --git a/Makefile b/Makefile
index 98ca9d951..8cf9feacb 100644
--- a/Makefile
+++ b/Makefile
@@ -226,7 +226,7 @@ testing/infra/terraform/modules/%/README.md: .FORCE
 # Beats synchronisation.
 ##############################################################################
 
-BEATS_VERSION?=main
+BEATS_VERSION?=9.2
 BEATS_MODULE:=github.com/elastic/beats/v7
 
 .PHONY: update-beats
::endgroup::
::group::create-commit
 M Makefile
check that executables have shebangs.................(no files to check)Skipped
check that scripts with shebangs are executable..........................Passed
check for merge conflicts................................................Passed
[9.2 7218352dd] [Release] update version 9.2.0
 1 file changed, 1 insertion(+), 1 deletion(-)
::endgroup::
INFO: Create feature branch and update the versions. Target branch main
::group::create-branch update-9.2.0
Switched to branch 'main'
Your branch is up to date with 'origin/main'.
Switched to a new branch 'update-9.2.0'
::endgroup::
>> update-mergify
Update mergify with backport-9.2
>> update-version
::group::git-diff
diff --git a/.mergify.yml b/.mergify.yml
index de06d4827..092ea2382 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -339,3 +339,12 @@ pull_request_rules:
       backport:
         branches:
           - "9.1"
+  - name: backport patches to 9.2 branch
+    conditions:
+      - merged
+      - base=main
+      - label=backport-9.2
+    actions:
+      backport:
+        branches:
+          - "9.2"
diff --git a/cmd/intake-receiver/version.go b/cmd/intake-receiver/version.go
index 75521d1a0..fc0da724e 100644
--- a/cmd/intake-receiver/version.go
+++ b/cmd/intake-receiver/version.go
@@ -18,4 +18,4 @@
 package main
 
 // version matches the APM Server's version
-const version = "9.2.0"
+const version = "9.3.0"
diff --git a/internal/version/version.go b/internal/version/version.go
index 0e5623c25..b745f2680 100644
--- a/internal/version/version.go
+++ b/internal/version/version.go
@@ -18,4 +18,4 @@
 package version
 
 // Version holds the APM Server version.
-const Version = "9.2.0"
+const Version = "9.3.0"
::endgroup::
::group::create-commit
 M .mergify.yml
 M cmd/intake-receiver/version.go
 M internal/version/version.go
check that executables have shebangs.................(no files to check)Skipped
check that scripts with shebangs are executable..........................Passed
check for merge conflicts................................................Passed
[update-9.2.0 db9f9781e] [Release] update version 9.3.0
 3 files changed, 11 insertions(+), 2 deletions(-)
::endgroup::
>> update-changelog
>> updating changelog for 9.2.0
::group::git-diff
diff --git a/docs/release-notes/breaking-changes.md b/docs/release-notes/breaking-changes.md
index 4bebe1de0..a64e8bc91 100644
--- a/docs/release-notes/breaking-changes.md
+++ b/docs/release-notes/breaking-changes.md
@@ -21,6 +21,10 @@ Breaking changes can impact your Elastic applications, potentially disrupting no
 % **Action**<br> Steps for mitigating deprecation impact.
 % ::::
 
+## 9.2.0 [9-2-0]
+
+_No breaking changes_ 
+
 ## 9.0.0 [9-0-0]
 
 ::::{dropdown} Change server information endpoint "/" to only accept GET and HEAD requests
diff --git a/docs/release-notes/deprecations.md b/docs/release-notes/deprecations.md
index 3c558491f..eb688af09 100644
--- a/docs/release-notes/deprecations.md
+++ b/docs/release-notes/deprecations.md
@@ -18,6 +18,10 @@ Review the deprecated functionality for Elastic APM. While deprecations have no
 % **Action**<br> Steps for mitigating deprecation impact.
 % ::::
 
+## 9.2.0 [9-2-0]
+
+_No deprecations_ 
+
 ## 9.0.4 [9-0-4]
 
 _No deprecations_
diff --git a/docs/release-notes/index.md b/docs/release-notes/index.md
index 570b47cc3..d9a608bb8 100644
--- a/docs/release-notes/index.md
+++ b/docs/release-notes/index.md
@@ -24,6 +24,18 @@ To check for security updates, go to [Security announcements for the Elastic sta
 % ### Fixes [elastic-apm-next-fixes]
 % * 1 sentence describing the change. ([#PR number](https://github.com/elastic/apm-server/pull/PR number))
 
+## 9.2.0 [9-2-0]
+
+% ### Features and enhancements [9-2-0-features-enhancements]
+% * 1 sentence describing the change. ([#PR number](https://github.com/elastic/apm-server/pull/PR number))
+
+_No new features or enhancements_ 
+
+% ### Fixes [9-2-0-fixes]
+% * 1 sentence describing the change. ([#PR number](https://github.com/elastic/apm-server/pull/PR number))
+
+_No new fixes_ 
+
 ## 9.1.4 [elastic-apm-9.1.4-release-notes]
 
 ## 9.1.3 [elastic-apm-9.1.3-release-notes]
::endgroup::
::group::create-commit
 M docs/release-notes/breaking-changes.md
 M docs/release-notes/deprecations.md
 M docs/release-notes/index.md
check that executables have shebangs.................(no files to check)Skipped
check that scripts with shebangs are executable..........................Passed
check for merge conflicts................................................Passed
[update-9.2.0 5f86a6016] [Release] update changelogs for 9.2 release
 3 files changed, 20 insertions(+)
::endgroup::
INFO: Push changes to v1v/apm-server and create the relevant Pull Requests
Enumerating objects: 5, done.
Counting objects: 100% (5/5), done.
Delta compression using up to 12 threads
Compressing objects: 100% (3/3), done.
Writing objects: 100% (3/3), 982 bytes | 982.00 KiB/s, done.
Total 3 (delta 2), reused 0 (delta 0), pack-reused 0 (from 0)
remote: Resolving deltas: 100% (2/2), completed with 2 local objects.
remote: Bypassed rule violations for refs/heads/9.2:
remote: 
remote: - This branch must not contain merge commits.
remote:   Found 1 violation:
remote: 
remote:   f831d2a93b9a51a58a63caff33761ae1c562b9df
remote: 
remote: 
remote: Create a pull request for '9.2' on GitHub by visiting:
remote:      https://github.com/v1v/apm-server/pull/new/9.2
remote: 
To https://github.com/v1v/apm-server.git
 * [new branch]          9.2 -> 9.2
::group::create-pull-request update-9.2.0 -> main
Enumerating objects: 29, done.
Counting objects: 100% (29/29), done.
Delta compression using up to 12 threads
Compressing objects: 100% (16/16), done.
Writing objects: 100% (16/16), 2.81 KiB | 1.41 MiB/s, done.
Total 16 (delta 11), reused 0 (delta 0), pack-reused 0 (from 0)
remote: Resolving deltas: 100% (11/11), completed with 10 local objects.
remote: 
remote: Create a pull request for 'update-9.2.0' on GitHub by visiting:
remote:      https://github.com/v1v/apm-server/pull/new/update-9.2.0
remote: 
To https://github.com/v1v/apm-server.git
 * [new branch]          update-9.2.0 -> update-9.2.0
--label 
https://github.com/v1v/apm-server/pull/88
::endgroup::

v1v/apm-server@main...v1v:apm-server:9.2

@inge4pres inge4pres added this pull request to the merge queue Oct 1, 2025
Merged via the queue into main with commit c8f9160 Oct 1, 2025
22 checks passed
@inge4pres inge4pres deleted the feature/use-app-instead-bot branch October 1, 2025 14:25
Copy link
Contributor

@fr4nc1sc0-r4m0n fr4nc1sc0-r4m0n left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants