Skip to content

Commit 0abc341

Browse files
v1vmergify[bot]
authored andcommitted
7.17 reached EoL (#48364)
(cherry picked from commit 7e90e2c) # Conflicts: # .github/workflows/bump-golang.yml # .github/workflows/updatecli.d/bump-golang-7.17.yml # catalog-info.yaml
1 parent e235c8e commit 0abc341

3 files changed

Lines changed: 224 additions & 5 deletions

File tree

.github/workflows/bump-golang.yml

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,26 @@ jobs:
1414
permissions:
1515
contents: write
1616
pull-requests: write
17-
strategy:
18-
fail-fast: false
19-
matrix:
20-
file: ['bump-golang.yml', 'bump-golang-7.17.yml']
2117
steps:
2218

19+
<<<<<<< HEAD
2320
- uses: actions/checkout@v4
2421

2522
- name: Install Updatecli in the runner
2623
uses: updatecli/updatecli-action@9a37c7e35598d7b37d8e7568b40ed9538112be01 # v0.76.1
2724

2825
- name: Run Updatecli in Apply mode
2926
run: updatecli --experimental apply --config .github/workflows/updatecli.d/${{ matrix.file }} --values .github/workflows/updatecli.d/values.d/scm.yml
27+
=======
28+
- uses: elastic/oblt-actions/updatecli/run-and-notify@v1
29+
with:
30+
command: --experimental apply --config .github/workflows/updatecli.d/bump-golang.yml --values .github/workflows/updatecli.d/values.d/scm.yml
31+
slack-bot-token: ${{ secrets.SLACK_BOT_TOKEN }}
32+
slack-channel-id: "#ingest-notifications"
33+
slack-message: ":traffic_cone: updatecli failed for `${{ github.repository }}@${{ github.ref_name }}`, @robots-ci please look what's going on <https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}|here>"
34+
slack-send-when: "failure"
35+
version-file: .updatecli-version
36+
>>>>>>> 7e90e2cbc (7.17 reached EoL (#48364))
3037
env:
3138
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3239

.github/workflows/golangci-lint.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ on:
44
# branches:
55
# - main
66
# - 8.*
7-
# - 7.17
87
pull_request:
98
permissions:
109
contents: read

0 commit comments

Comments
 (0)