From bc7217203425d290226ae5b3933c840972712dfb Mon Sep 17 00:00:00 2001
From: Victor Martinez <victormartinezrubio@gmail.com>
Date: Wed, 3 Jul 2024 16:32:25 +0200
Subject: [PATCH] udpatecli: support bump golang for 7.17 (#13559)

(cherry picked from commit 6e8f87116d3411dcd07fd5a9013d0dee8fbf98c2)

# Conflicts:
#	.github/workflows/bump-golang.yml
---
 .ci/bump-golang.yml               |  2 +-
 .github/workflows/bump-golang.yml | 29 +++++++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/.ci/bump-golang.yml b/.ci/bump-golang.yml
index b863c094858..af7726e681b 100644
--- a/.ci/bump-golang.yml
+++ b/.ci/bump-golang.yml
@@ -27,7 +27,7 @@ scms:
       owner: elastic
       repository: apm-server
       token: '{{ requiredEnv "GITHUB_TOKEN" }}'
-      branch: main
+      branch: '{{ requiredEnv "GITHUB_BRANCH" }}'
       commitusingapi: true
 
 sources:
diff --git a/.github/workflows/bump-golang.yml b/.github/workflows/bump-golang.yml
index 247869f9428..fbef80649a1 100644
--- a/.github/workflows/bump-golang.yml
+++ b/.github/workflows/bump-golang.yml
@@ -21,9 +21,38 @@ jobs:
           command: --experimental apply --config .ci/bump-golang.yml
         env:
           GITHUB_TOKEN: ${{ secrets.UPDATECLI_GH_TOKEN }}
+          GITHUB_BRANCH: 'main'
 
+<<<<<<< HEAD
       - if: ${{ failure() }}
         uses: elastic/oblt-actions/slack/send@v1.2.0
+=======
+  bump-7:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: '7.17'
+
+      - uses: elastic/oblt-actions/updatecli/run@v1.9.1
+        with:
+          command: --experimental apply --config .ci/bump-golang.yml
+        env:
+          GITHUB_TOKEN: ${{ secrets.UPDATECLI_GH_TOKEN }}
+          GITHUB_BRANCH: '7.17'
+
+  notify:
+    runs-on: ubuntu-latest
+    needs: [bump, bump-7]
+    if: always()
+    steps:
+      - id: check
+        uses: elastic/apm-pipeline-library/.github/actions/check-dependent-jobs@current
+        with:
+          needs: ${{ toJSON(needs) }}
+      - if: ${{ steps.check.outputs.isSuccess == 'false' }}
+        uses: elastic/oblt-actions/slack/send@v1.9.1
+>>>>>>> 6e8f87116 (udpatecli: support bump golang for 7.17 (#13559))
         with:
           bot-token: ${{ secrets.SLACK_BOT_TOKEN }}
           channel-id: "#apm-server"