From 4e5dcf23640010e6ed62c329993ac3d3919b3c09 Mon Sep 17 00:00:00 2001
From: Elastic Machine <elasticmachine@users.noreply.github.com>
Date: Thu, 7 Dec 2023 22:26:45 +1100
Subject: [PATCH] backport: Add 8.12 branch (#12171)

* docs: update docs

* [Release] update version

* Fix broken version

---------

Co-authored-by: simitt <silvia.mitter@elastic.co>
Co-authored-by: Marc Lopez Rubio <marc5.12@outlook.com>
---
 .mergify.yml                   | 14 ++++++++++++++
 apmpackage/apm/changelog.yml   |  5 +++++
 cmd/intake-receiver/version.go |  2 +-
 internal/version/version.go    |  2 +-
 4 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/.mergify.yml b/.mergify.yml
index 1f3ae86e04f..173043031e2 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -304,3 +304,17 @@ pull_request_rules:
         labels:
           - "backport"
         title: "[{{ destination_branch }}] {{ title }} (backport #{{ number }})"
+  - name: backport patches to 8.12 branch
+    conditions:
+      - merged
+      - base=main
+      - label=backport-8.12
+    actions:
+      backport:
+        assignees:
+          - "{{ author }}"
+        branches:
+          - "8.12"
+        labels:
+          - "backport"
+        title: "[{{ destination_branch }}] {{ title }} (backport #{{ number }})"
diff --git a/apmpackage/apm/changelog.yml b/apmpackage/apm/changelog.yml
index 841afb1123d..cc4b88d81a4 100644
--- a/apmpackage/apm/changelog.yml
+++ b/apmpackage/apm/changelog.yml
@@ -1,4 +1,9 @@
 - version: generated
+  changes:
+    - description: Placeholder
+      type: enhancement
+      link: https://github.com/elastic/apm-server/pull/123
+- version: 8.12.0
   changes:
     - description: Add missing mappings for various fields
       type: enhancement
diff --git a/cmd/intake-receiver/version.go b/cmd/intake-receiver/version.go
index dbe4d25625d..bddb4af2de5 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 = "8.12.0"
+const version = "8.13.0"
diff --git a/internal/version/version.go b/internal/version/version.go
index 1e734dbbe66..e9b837e114b 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 = "8.12.0"
+const Version = "8.13.0"