Skip to content

Commit c6ce470

Browse files
authored
Merge branch 'elastic:main' into review/captureStackTrace
2 parents 88b2c85 + 19f0ee9 commit c6ce470

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

.github/workflows/ci-saucelabs.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ jobs:
7979
- test-saucelabs
8080
steps:
8181
- id: check
82-
uses: elastic/apm-pipeline-library/.github/actions/check-dependent-jobs@current
82+
uses: elastic/oblt-actions/check-dependent-jobs@v1
8383
with:
84-
needs: ${{ toJSON(needs) }}
85-
- run: ${{ steps.check.outputs.isSuccess }}
84+
jobs: ${{ toJSON(needs) }}
85+
- run: ${{ steps.check.outputs.is-success }}

.github/workflows/ci.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ jobs:
6666
matrix:
6767
stack-version:
6868
- '8.0.0-SNAPSHOT'
69-
- '8.14.1'
69+
- '8.15.5'
7070
scope:
7171
- '@elastic/apm-rum'
7272
- '@elastic/apm-rum-core'
@@ -90,10 +90,10 @@ jobs:
9090
- test-puppeteer
9191
steps:
9292
- id: check
93-
uses: elastic/apm-pipeline-library/.github/actions/check-dependent-jobs@current
93+
uses: elastic/oblt-actions/check-dependent-jobs@v1
9494
with:
95-
needs: ${{ toJSON(needs) }}
96-
- run: ${{ steps.check.outputs.isSuccess }}
95+
jobs: ${{ toJSON(needs) }}
96+
- run: ${{ steps.check.outputs.is-success }}
9797

9898
coverage:
9999
name: Coverage
@@ -104,4 +104,4 @@ jobs:
104104
uses: ./.github/workflows/run-test
105105
with:
106106
goal: 'coverage'
107-
stack-version: '8.14.1'
107+
stack-version: '8.15.5'

.github/workflows/microbenchmark.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
inputs:
66
stack_version:
77
description: 'Stack Version'
8-
default: '8.14.1'
8+
default: '8.15.5'
99
required: false
1010
push:
1111
branches:
@@ -26,7 +26,7 @@ jobs:
2626
- name: Run buildkite pipeline
2727
uses: elastic/oblt-actions/buildkite/run@v1
2828
env:
29-
STACK_VERSION: ${{ inputs.stack_version || '8.14.1' }}
29+
STACK_VERSION: ${{ inputs.stack_version || '8.15.5' }}
3030
with:
3131
token: ${{ secrets.BUILDKITE_TOKEN }}
3232
pipeline: apm-agent-microbenchmark

0 commit comments

Comments
 (0)