From 3a86ee24222a0471c8547ef7bfa758d3502aa053 Mon Sep 17 00:00:00 2001
From: Victor Martinez <VictorMartinezRubio@gmail.com>
Date: Mon, 20 Mar 2023 08:26:53 +0100
Subject: [PATCH] updatecli: auto-merge and override title

---
 .ci/bump-golang.yml |  9 ++++-----
 .mergify.yml        | 10 ++++++++++
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/.ci/bump-golang.yml b/.ci/bump-golang.yml
index 9ec9e415..f8c139f2 100644
--- a/.ci/bump-golang.yml
+++ b/.ci/bump-golang.yml
@@ -15,16 +15,15 @@ scms:
       branch: '{{ requiredEnv "BRANCH" }}'
 
 actions:
-  golang-crossbuild:
+  default:
+    title: '[Automation] Bump Golang version to {{ source "latestGoVersion" }}'
     kind: github/pullrequest
     scmid: githubConfig
-    sourceid: latestGoVersion
     spec:
-      automerge: false
+      automerge: true
       labels:
         - dependencies
         - backport-skip
-      title: '[Automation] Bump Golang version to {{ source "latestGoVersion" }}'
       description: |
         See [changelog](https://github.com/golang/go/issues?q=milestone%3AGo{{ source "latestGoVersion" }}+label%3ACherryPickApproved) for {{ source "latestGoVersion" }}
 
@@ -75,7 +74,7 @@ conditions:
 
 targets:
   update-go-versions:
-    name: "Update go versions"
+    name: "Update go version '{{ source "latestGoVersion" }}'"
     kind: shell
     sourceid: latestGoVersion
     scmid: githubConfig
diff --git a/.mergify.yml b/.mergify.yml
index ea09b072..8b4d40a5 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -10,6 +10,16 @@ pull_request_rules:
         - files~=^Jenkinsfile$
     actions:
       delete_head_branch:
+  - name: automatic approval for automated pull requests with golang bump updates
+    conditions:
+      - author=apmmachine
+      - check-success=beats-ci/pr-merge
+      - label=automation
+      - files~=^go/Makefile.common
+    actions:
+      review:
+        type: APPROVE
+        message: Automatically approving mergify
   - name: ask to resolve conflict
     conditions:
       - -merged