From 146444c16124f64d1360d26e76be70a141b5cb83 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Tue, 3 Sep 2024 09:53:31 +0200 Subject: [PATCH 1/2] github-actions: replace apm-pipeline-library actions for oblt-actions (#13975) (cherry picked from commit 3b4a9c2e55557ec0114b094c618e2773bcbaa80f) # Conflicts: # .github/workflows/bump-golang.yml --- .github/workflows/bump-elastic-stack.yml | 2 +- .github/workflows/bump-golang.yml | 31 ++++++++++++++++++++-- .github/workflows/check-docker-compose.yml | 6 ++--- .github/workflows/smoke-tests-schedule.yml | 6 ++--- .github/workflows/update-beats.yml | 2 +- 5 files changed, 37 insertions(+), 10 deletions(-) diff --git a/.github/workflows/bump-elastic-stack.yml b/.github/workflows/bump-elastic-stack.yml index 65c6e4d9d2..36a16bbb4a 100644 --- a/.github/workflows/bump-elastic-stack.yml +++ b/.github/workflows/bump-elastic-stack.yml @@ -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 diff --git a/.github/workflows/bump-golang.yml b/.github/workflows/bump-golang.yml index d288cf5050..e5268eb845 100644 --- a/.github/workflows/bump-golang.yml +++ b/.github/workflows/bump-golang.yml @@ -10,6 +10,33 @@ permissions: contents: read jobs: +<<<<<<< HEAD +======= + + labels: + runs-on: ubuntu-latest + timeout-minutes: 1 + outputs: + backports: ${{ steps.labels.outputs.backports }} + steps: + - id: generate + name: Generate matrix + uses: elastic/oblt-actions/elastic/active-branches@v1 + with: + exclude-branches: '7.17,main' + - uses: actions/github-script@v7 + id: labels + env: + BRANCHES: ${{ steps.generate.outputs.branches }} + with: + script: | + // We only support the latest minor version + const branches = JSON.parse(process.env.BRANCHES) + .sort((a, b) => parseFloat(b) - parseFloat(a)); + const latest = branches[0] + core.setOutput("backports", `backport-${branches[0].trim()}`) + +>>>>>>> 3b4a9c2e5 (github-actions: replace apm-pipeline-library actions for oblt-actions (#13975)) bump: runs-on: ubuntu-latest steps: @@ -43,9 +70,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: diff --git a/.github/workflows/check-docker-compose.yml b/.github/workflows/check-docker-compose.yml index c86ef94bca..23b49b0974 100644 --- a/.github/workflows/check-docker-compose.yml +++ b/.github/workflows/check-docker-compose.yml @@ -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 check-docker-compose: needs: @@ -47,9 +47,9 @@ jobs: - check-docker-compose 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) }} - run: ${{ steps.check.outputs.isSuccess }} - if: failure() uses: elastic/oblt-actions/slack/notify-result@v1 diff --git a/.github/workflows/smoke-tests-schedule.yml b/.github/workflows/smoke-tests-schedule.yml index e1d3bfa548..67abea27ac 100644 --- a/.github/workflows/smoke-tests-schedule.yml +++ b/.github/workflows/smoke-tests-schedule.yml @@ -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' @@ -57,9 +57,9 @@ 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: - needs: ${{ toJSON(needs) }} + jobs: ${{ toJSON(needs) }} - uses: elastic/oblt-actions/slack/notify-result@v1.9.1 with: bot-token: ${{ secrets.SLACK_BOT_TOKEN }} diff --git a/.github/workflows/update-beats.yml b/.github/workflows/update-beats.yml index ef72d8b957..9570c89a82 100644 --- a/.github/workflows/update-beats.yml +++ b/.github/workflows/update-beats.yml @@ -16,7 +16,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 From f6716660bec7b034dc5e281b699d702b712e9a0c Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Tue, 3 Sep 2024 09:58:45 +0200 Subject: [PATCH 2/2] Update .github/workflows/bump-golang.yml --- .github/workflows/bump-golang.yml | 27 --------------------------- 1 file changed, 27 deletions(-) diff --git a/.github/workflows/bump-golang.yml b/.github/workflows/bump-golang.yml index e5268eb845..8e4d15075d 100644 --- a/.github/workflows/bump-golang.yml +++ b/.github/workflows/bump-golang.yml @@ -10,33 +10,6 @@ permissions: contents: read jobs: -<<<<<<< HEAD -======= - - labels: - runs-on: ubuntu-latest - timeout-minutes: 1 - outputs: - backports: ${{ steps.labels.outputs.backports }} - steps: - - id: generate - name: Generate matrix - uses: elastic/oblt-actions/elastic/active-branches@v1 - with: - exclude-branches: '7.17,main' - - uses: actions/github-script@v7 - id: labels - env: - BRANCHES: ${{ steps.generate.outputs.branches }} - with: - script: | - // We only support the latest minor version - const branches = JSON.parse(process.env.BRANCHES) - .sort((a, b) => parseFloat(b) - parseFloat(a)); - const latest = branches[0] - core.setOutput("backports", `backport-${branches[0].trim()}`) - ->>>>>>> 3b4a9c2e5 (github-actions: replace apm-pipeline-library actions for oblt-actions (#13975)) bump: runs-on: ubuntu-latest steps: