Skip to content

Commit 1387022

Browse files
v1vmergify[bot]
authored andcommitted
fix: asdf issues with updatecli in the tool-versions (#45286)
(cherry picked from commit 68600b7) # Conflicts: # .github/workflows/bump-elastic-stack-snapshot.yml # .github/workflows/bump-golang.yml # .github/workflows/updatecli-compose.yml # .updatecli-version
1 parent e776316 commit 1387022

File tree

4 files changed

+39
-0
lines changed

4 files changed

+39
-0
lines changed

.github/workflows/bump-elastic-stack-snapshot.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,22 @@ jobs:
3131
steps:
3232
- uses: actions/checkout@v4
3333

34+
<<<<<<< HEAD
3435
- name: Install Updatecli in the runner
3536
uses: updatecli/updatecli-action@704a64517239e0993c5e3bf6749a063b8f950d9f # v0.76.1
3637

3738
- name: Run Updatecli in Apply mode
3839
run: updatecli --experimental apply --config .github/workflows/updatecli.d/bump-elastic-stack-snapshot.yml --values .github/workflows/updatecli.d/values.d/scm.yml
40+
=======
41+
- uses: elastic/oblt-actions/updatecli/run-and-notify@v1
42+
with:
43+
command: --experimental apply --config .github/workflows/updatecli.d/bump-elastic-stack-snapshot.yml --values .github/workflows/updatecli.d/values.d/scm.yml
44+
slack-bot-token: ${{ secrets.SLACK_BOT_TOKEN }}
45+
slack-channel-id: "#ingest-notifications"
46+
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>"
47+
slack-send-when: "failure"
48+
version-file: .updatecli-version
49+
>>>>>>> 68600b701 (fix: asdf issues with updatecli in the tool-versions (#45286))
3950
env:
4051
BRANCH: ${{ matrix.branch }}
4152
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/bump-golang.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,22 @@ jobs:
2222
steps:
2323
- uses: actions/checkout@v4
2424

25+
<<<<<<< HEAD
2526
- name: Install Updatecli in the runner
2627
uses: updatecli/updatecli-action@704a64517239e0993c5e3bf6749a063b8f950d9f # v0.76.1
2728

2829
- name: Run Updatecli in Apply mode
2930
run: updatecli --experimental apply --config .github/workflows/updatecli.d/${{ matrix.file }} --values .github/workflows/updatecli.d/values.d/scm.yml
31+
=======
32+
- uses: elastic/oblt-actions/updatecli/run-and-notify@v1
33+
with:
34+
command: --experimental apply --config .github/workflows/updatecli.d/${{ matrix.file }} --values .github/workflows/updatecli.d/values.d/scm.yml
35+
slack-bot-token: ${{ secrets.SLACK_BOT_TOKEN }}
36+
slack-channel-id: "#ingest-notifications"
37+
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>"
38+
slack-send-when: "failure"
39+
version-file: .updatecli-version
40+
>>>>>>> 68600b701 (fix: asdf issues with updatecli in the tool-versions (#45286))
3041
env:
3142
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3243

.github/workflows/updatecli-compose.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,28 @@ jobs:
2828
- uses: elastic/oblt-actions/updatecli/run@v1
2929
with:
3030
command: --experimental compose diff
31+
<<<<<<< HEAD
32+
=======
33+
slack-bot-token: ${{ secrets.SLACK_BOT_TOKEN }}
34+
slack-channel-id: "#ingest-notifications"
35+
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>"
36+
slack-send-when: "failure"
37+
version-file: .updatecli-version
38+
>>>>>>> 68600b701 (fix: asdf issues with updatecli in the tool-versions (#45286))
3139
env:
3240
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3341

3442
- uses: elastic/oblt-actions/updatecli/run@v1
3543
with:
3644
command: --experimental compose apply
45+
<<<<<<< HEAD
46+
=======
47+
slack-bot-token: ${{ secrets.SLACK_BOT_TOKEN }}
48+
slack-channel-id: "#ingest-notifications"
49+
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>"
50+
slack-send-when: "failure"
51+
version-file: .updatecli-version
52+
>>>>>>> 68600b701 (fix: asdf issues with updatecli in the tool-versions (#45286))
3753
env:
3854
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3955

.updatecli-version

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
updatecli v0.97.0

0 commit comments

Comments
 (0)