File tree 5 files changed +40
-7
lines changed
5 files changed +40
-7
lines changed Original file line number Diff line number Diff line change 17
17
matrix : ${{ steps.generator.outputs.matrix }}
18
18
steps :
19
19
- id : generator
20
- uses : elastic/apm-pipeline-library/.github/ actions/elastic-stack-snapshot- branches@current
20
+ uses : elastic/oblt- actions/elastic/active- branches@v1
21
21
22
22
bump-elastic-stack :
23
23
runs-on : ubuntu-latest
Original file line number Diff line number Diff line change 19
19
steps :
20
20
- id : generate
21
21
name : Generate matrix
22
- uses : elastic/apm-pipeline-library/.github/ actions/elastic-stack-snapshot- branches@current
22
+ uses : elastic/oblt- actions/elastic/active- branches@v1
23
23
with :
24
24
exclude-branches : ' 7.17,main'
25
25
- uses : actions/github-script@v7
72
72
if : always()
73
73
steps :
74
74
- id : check
75
- uses : elastic/apm-pipeline-library/.github/ actions/check-dependent-jobs@current
75
+ uses : elastic/oblt- actions/check-dependent-jobs@v1
76
76
with :
77
- needs : ${{ toJSON(needs) }}
77
+ jobs : ${{ toJSON(needs) }}
78
78
- if : ${{ steps.check.outputs.isSuccess == 'false' }}
79
79
uses : elastic/oblt-actions/slack/send@v1
80
80
with :
Original file line number Diff line number Diff line change @@ -10,6 +10,18 @@ permissions:
10
10
contents : read
11
11
12
12
jobs :
13
+ <<<<<<< HEAD
14
+ =======
15
+ filter :
16
+ runs-on : ubuntu-latest
17
+ timeout-minutes : 1
18
+ outputs :
19
+ matrix : ${{ steps.generator.outputs.matrix }}
20
+ steps :
21
+ - id : generator
22
+ uses : elastic/oblt-actions/elastic/active-branches@v1
23
+
24
+ >>>>>>> 3b4a9c2e5 (github-actions: replace apm-pipeline-library actions for oblt-actions (#13975))
13
25
check-docker-compose :
14
26
runs-on : ubuntu-latest
15
27
steps :
22
34
go.sum
23
35
tools/go.sum
24
36
- run : make check-docker-compose
37
+ <<<<<<< HEAD
38
+ =======
39
+
40
+ all-check-docker-compose :
41
+ name : All check-docker-compose
42
+ if : always()
43
+ runs-on : ubuntu-latest
44
+ needs :
45
+ - check-docker-compose
46
+ steps :
47
+ - id : check
48
+ uses : elastic/oblt-actions/check-dependent-jobs@v1
49
+ with :
50
+ jobs : ${{ toJSON(needs) }}
51
+ - run : ${{ steps.check.outputs.isSuccess }}
52
+ >>>>>>> 3b4a9c2e5 (github-actions: replace apm-pipeline-library actions for oblt-actions (#13975))
25
53
- if : failure()
26
54
uses : elastic/oblt-actions/slack/notify-result@v1
27
55
with :
Original file line number Diff line number Diff line change 20
20
- uses : actions/checkout@v4
21
21
- id : generate
22
22
name : Generate matrix
23
- uses : elastic/apm-pipeline-library/.github/ actions/elastic-stack-snapshot- branches@current
23
+ uses : elastic/oblt- actions/elastic/active- branches@v1
24
24
with :
25
25
exclude-branches : ' 7.17'
26
26
@@ -57,10 +57,15 @@ jobs:
57
57
- smoke-tests-ess
58
58
steps :
59
59
- id : check
60
- uses : elastic/apm-pipeline-library/.github/ actions/check-dependent-jobs@current
60
+ uses : elastic/oblt- actions/check-dependent-jobs@v1
61
61
with :
62
+ <<<<<<< HEAD
62
63
needs : ${{ toJSON(needs) }}
63
64
-
uses :
elastic/oblt-actions/slack/[email protected]
65
+ =======
66
+ jobs : ${{ toJSON(needs) }}
67
+ -
uses :
elastic/oblt-actions/slack/[email protected]
68
+ >>>>>>> 3b4a9c2e5 (github-actions: replace apm-pipeline-library actions for oblt-actions (#13975))
64
69
with :
65
70
bot-token : ${{ secrets.SLACK_BOT_TOKEN }}
66
71
channel-id : " #apm-server"
Original file line number Diff line number Diff line change 17
17
matrix : ${{ steps.generator.outputs.matrix }}
18
18
steps :
19
19
- id : generator
20
- uses : elastic/apm-pipeline-library/.github/ actions/elastic-stack-snapshot- branches@current
20
+ uses : elastic/oblt- actions/elastic/active- branches@v1
21
21
bump :
22
22
needs :
23
23
- filter
You can’t perform that action at this time.
0 commit comments