File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 7171 # GitHub bot won't trigger any CI builds.
7272 # See https://github.com/peter-evans/create-pull-request/issues/48#issuecomment-537478081
7373 - name : Configure git user
74- <<<<<<< HEAD
75- uses : elastic/oblt-actions/git/setup@31e93d1dfb82adc106fc7820f505db1afefe43b1 # v1
76- =======
7774 uses : elastic/oblt-actions/git/setup@v1
78- >>>>>>> 0e1f32a6 (ci: revert image pinning for internal and github actions (#17191))
7975 with :
8076 github-token : ${{ steps.get_token.outputs.token }}
8177
9288 GH_TOKEN : ${{ steps.get_token.outputs.token }}
9389
9490 - if : success()
95- <<<<<<< HEAD
96- uses : elastic/oblt-actions/slack/send@31e93d1dfb82adc106fc7820f505db1afefe43b1 # v1
97- =======
9891 uses : elastic/oblt-actions/slack/send@v1
99- >>>>>>> 0e1f32a6 (ci: revert image pinning for internal and github actions (#17191))
10092 with :
10193 bot-token : ${{ secrets.SLACK_BOT_TOKEN }}
10294 channel-id : ${{ env.SLACK_CHANNEL }}
@@ -106,11 +98,7 @@ jobs:
10698 thread-timestamp : ${{ needs.prepare.outputs.slack-thread || '' }}
10799
108100 - if : failure()
109- <<<<<<< HEAD
110- uses : elastic/oblt-actions/slack/send@31e93d1dfb82adc106fc7820f505db1afefe43b1 # v1
111- =======
112101 uses : elastic/oblt-actions/slack/send@v1
113- >>>>>>> 0e1f32a6 (ci: revert image pinning for internal and github actions (#17191))
114102 with :
115103 bot-token : ${{ secrets.SLACK_BOT_TOKEN }}
116104 channel-id : ${{ env.SLACK_CHANNEL }}
You can’t perform that action at this time.
0 commit comments