From 77d4a8ebd07d819f9e58d4862a2a59a802d2a98b Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Wed, 3 Jul 2024 16:08:22 +0200 Subject: [PATCH] udpatecli: support bump golang for 7.17 --- .ci/bump-golang.yml | 2 +- .github/workflows/bump-golang.yml | 25 ++++++++++++++++++++++++- 2 files changed, 25 insertions(+), 2 deletions(-) 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 89b9b51fa90..034aa538b74 100644 --- a/.github/workflows/bump-golang.yml +++ b/.github/workflows/bump-golang.yml @@ -21,8 +21,31 @@ jobs: command: --experimental apply --config .ci/bump-golang.yml env: GITHUB_TOKEN: ${{ secrets.UPDATECLI_GH_TOKEN }} + GITHUB_BRANCH: 'main' - - if: ${{ failure() }} + bump-7: + runs-on: ubuntu-latest + steps: + + - uses: actions/checkout@v4 + + - 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 with: bot-token: ${{ secrets.SLACK_BOT_TOKEN }}