Skip to content

Commit

Permalink
Merge branch 'elastic:main' into review/captureStackTrace
Browse files Browse the repository at this point in the history
  • Loading branch information
cjr125 authored Dec 4, 2024
2 parents 88b2c85 + 19f0ee9 commit c6ce470
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci-saucelabs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ jobs:
- test-saucelabs
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) }}
- run: ${{ steps.check.outputs.isSuccess }}
jobs: ${{ toJSON(needs) }}
- run: ${{ steps.check.outputs.is-success }}
10 changes: 5 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ jobs:
matrix:
stack-version:
- '8.0.0-SNAPSHOT'
- '8.14.1'
- '8.15.5'
scope:
- '@elastic/apm-rum'
- '@elastic/apm-rum-core'
Expand All @@ -90,10 +90,10 @@ jobs:
- test-puppeteer
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) }}
- run: ${{ steps.check.outputs.isSuccess }}
jobs: ${{ toJSON(needs) }}
- run: ${{ steps.check.outputs.is-success }}

coverage:
name: Coverage
Expand All @@ -104,4 +104,4 @@ jobs:
uses: ./.github/workflows/run-test
with:
goal: 'coverage'
stack-version: '8.14.1'
stack-version: '8.15.5'
4 changes: 2 additions & 2 deletions .github/workflows/microbenchmark.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
inputs:
stack_version:
description: 'Stack Version'
default: '8.14.1'
default: '8.15.5'
required: false
push:
branches:
Expand All @@ -26,7 +26,7 @@ jobs:
- name: Run buildkite pipeline
uses: elastic/oblt-actions/buildkite/run@v1
env:
STACK_VERSION: ${{ inputs.stack_version || '8.14.1' }}
STACK_VERSION: ${{ inputs.stack_version || '8.15.5' }}
with:
token: ${{ secrets.BUILDKITE_TOKEN }}
pipeline: apm-agent-microbenchmark
Expand Down

0 comments on commit c6ce470

Please sign in to comment.