Skip to content

Commit eadc7b8

Browse files
v1vmergify[bot]
authored andcommitted
github-actions: replace apm-pipeline-library actions for oblt-actions (#13975)
(cherry picked from commit 3b4a9c2) # Conflicts: # .github/workflows/check-docker-compose.yml # .github/workflows/smoke-tests-schedule.yml
1 parent b4997cf commit eadc7b8

5 files changed

+40
-7
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
matrix: ${{ steps.generator.outputs.matrix }}
1818
steps:
1919
- id: generator
20-
uses: elastic/apm-pipeline-library/.github/actions/elastic-stack-snapshot-branches@current
20+
uses: elastic/oblt-actions/elastic/active-branches@v1
2121

2222
bump-elastic-stack:
2323
runs-on: ubuntu-latest

.github/workflows/bump-golang.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
steps:
2020
- id: generate
2121
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
2323
with:
2424
exclude-branches: '7.17,main'
2525
- uses: actions/github-script@v7
@@ -72,9 +72,9 @@ jobs:
7272
if: always()
7373
steps:
7474
- id: check
75-
uses: elastic/apm-pipeline-library/.github/actions/check-dependent-jobs@current
75+
uses: elastic/oblt-actions/check-dependent-jobs@v1
7676
with:
77-
needs: ${{ toJSON(needs) }}
77+
jobs: ${{ toJSON(needs) }}
7878
- if: ${{ steps.check.outputs.isSuccess == 'false' }}
7979
uses: elastic/oblt-actions/slack/send@v1
8080
with:

.github/workflows/check-docker-compose.yml

+28
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,18 @@ permissions:
1010
contents: read
1111

1212
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))
1325
check-docker-compose:
1426
runs-on: ubuntu-latest
1527
steps:
@@ -22,6 +34,22 @@ jobs:
2234
go.sum
2335
tools/go.sum
2436
- 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))
2553
- if: failure()
2654
uses: elastic/oblt-actions/slack/notify-result@v1
2755
with:

.github/workflows/smoke-tests-schedule.yml

+7-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- uses: actions/checkout@v4
2121
- id: generate
2222
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
2424
with:
2525
exclude-branches: '7.17'
2626

@@ -57,10 +57,15 @@ jobs:
5757
- smoke-tests-ess
5858
steps:
5959
- id: check
60-
uses: elastic/apm-pipeline-library/.github/actions/check-dependent-jobs@current
60+
uses: elastic/oblt-actions/check-dependent-jobs@v1
6161
with:
62+
<<<<<<< HEAD
6263
needs: ${{ toJSON(needs) }}
6364
- 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))
6469
with:
6570
bot-token: ${{ secrets.SLACK_BOT_TOKEN }}
6671
channel-id: "#apm-server"

.github/workflows/update-beats.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
matrix: ${{ steps.generator.outputs.matrix }}
1818
steps:
1919
- id: generator
20-
uses: elastic/apm-pipeline-library/.github/actions/elastic-stack-snapshot-branches@current
20+
uses: elastic/oblt-actions/elastic/active-branches@v1
2121
bump:
2222
needs:
2323
- filter

0 commit comments

Comments
 (0)