Skip to content

Commit

Permalink
github-actions: replace apm-pipeline-library actions for oblt-actions (
Browse files Browse the repository at this point in the history
…#13975)

(cherry picked from commit 3b4a9c2)

# Conflicts:
#	.github/workflows/check-docker-compose.yml
#	.github/workflows/smoke-tests-schedule.yml
  • Loading branch information
v1v authored and mergify[bot] committed Sep 3, 2024
1 parent b4997cf commit eadc7b8
Show file tree
Hide file tree
Showing 5 changed files with 40 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/bump-elastic-stack.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
matrix: ${{ steps.generator.outputs.matrix }}
steps:
- id: generator
uses: elastic/apm-pipeline-library/.github/actions/elastic-stack-snapshot-branches@current
uses: elastic/oblt-actions/elastic/active-branches@v1

bump-elastic-stack:
runs-on: ubuntu-latest
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/bump-golang.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
steps:
- id: generate
name: Generate matrix
uses: elastic/apm-pipeline-library/.github/actions/elastic-stack-snapshot-branches@current
uses: elastic/oblt-actions/elastic/active-branches@v1
with:
exclude-branches: '7.17,main'
- uses: actions/github-script@v7
Expand Down Expand Up @@ -72,9 +72,9 @@ jobs:
if: always()
steps:
- id: check
uses: elastic/apm-pipeline-library/.github/actions/check-dependent-jobs@current
uses: elastic/oblt-actions/check-dependent-jobs@v1
with:
needs: ${{ toJSON(needs) }}
jobs: ${{ toJSON(needs) }}
- if: ${{ steps.check.outputs.isSuccess == 'false' }}
uses: elastic/oblt-actions/slack/send@v1
with:
Expand Down
28 changes: 28 additions & 0 deletions .github/workflows/check-docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,18 @@ permissions:
contents: read

jobs:
<<<<<<< HEAD
=======
filter:
runs-on: ubuntu-latest
timeout-minutes: 1
outputs:
matrix: ${{ steps.generator.outputs.matrix }}
steps:
- id: generator
uses: elastic/oblt-actions/elastic/active-branches@v1

>>>>>>> 3b4a9c2e5 (github-actions: replace apm-pipeline-library actions for oblt-actions (#13975))
check-docker-compose:
runs-on: ubuntu-latest
steps:
Expand All @@ -22,6 +34,22 @@ jobs:
go.sum
tools/go.sum
- run: make check-docker-compose
<<<<<<< HEAD
=======

all-check-docker-compose:
name: All check-docker-compose
if: always()
runs-on: ubuntu-latest
needs:
- check-docker-compose
steps:
- id: check
uses: elastic/oblt-actions/check-dependent-jobs@v1
with:
jobs: ${{ toJSON(needs) }}
- run: ${{ steps.check.outputs.isSuccess }}
>>>>>>> 3b4a9c2e5 (github-actions: replace apm-pipeline-library actions for oblt-actions (#13975))
- if: failure()
uses: elastic/oblt-actions/slack/notify-result@v1
with:
Expand Down
9 changes: 7 additions & 2 deletions .github/workflows/smoke-tests-schedule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
- uses: actions/checkout@v4
- id: generate
name: Generate matrix
uses: elastic/apm-pipeline-library/.github/actions/elastic-stack-snapshot-branches@current
uses: elastic/oblt-actions/elastic/active-branches@v1
with:
exclude-branches: '7.17'

Expand Down Expand Up @@ -57,10 +57,15 @@ jobs:
- smoke-tests-ess
steps:
- id: check
uses: elastic/apm-pipeline-library/.github/actions/check-dependent-jobs@current
uses: elastic/oblt-actions/check-dependent-jobs@v1
with:
<<<<<<< HEAD
needs: ${{ toJSON(needs) }}
- uses: elastic/oblt-actions/slack/[email protected]
=======
jobs: ${{ toJSON(needs) }}
- uses: elastic/oblt-actions/slack/[email protected]
>>>>>>> 3b4a9c2e5 (github-actions: replace apm-pipeline-library actions for oblt-actions (#13975))
with:
bot-token: ${{ secrets.SLACK_BOT_TOKEN }}
channel-id: "#apm-server"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update-beats.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
matrix: ${{ steps.generator.outputs.matrix }}
steps:
- id: generator
uses: elastic/apm-pipeline-library/.github/actions/elastic-stack-snapshot-branches@current
uses: elastic/oblt-actions/elastic/active-branches@v1
bump:
needs:
- filter
Expand Down

0 comments on commit eadc7b8

Please sign in to comment.