backport: Add 8.12 branch (#12171)

* docs: update docs * [Release] update version * Fix broken version --------- Co-authored-by: simitt <[email protected]> Co-authored-by: Marc Lopez Rubio <[email protected]>
elastic · Dec 7, 2023 · 4e5dcf2 · 4e5dcf2
1 parent 19c8690
commit 4e5dcf2
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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
@@ -18,4 +18,4 @@
 package version
 
 // Version holds the APM Server version.
-const Version = "8.12.0"
+const Version = "8.13.0"