Skip to content

Commit 90f4887

Browse files
committed
Merge branch 'main' into support-ruby-3.4
2 parents fc3a0bf + 1b5490b commit 90f4887

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+2626
-3400
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ Update your local repository with the most recent code from the main repo, and r
4646
Run the test suite to make sure that nothing is broken. See https://github.com/elastic/apm-agent-ruby/blob/main/CONTRIBUTING.md#testing for details.
4747
-->
4848
- [ ] I have made corresponding changes to the documentation
49-
- [ ] I have updated [CHANGELOG.asciidoc](CHANGELOG.asciidoc)
50-
- [ ] I have updated [supported-technologies.asciidoc](docs/supported-technologies.asciidoc)
49+
- [ ] I have updated [docs/release-notes/index.md](../docs/release-notes/index.md)
50+
- [ ] I have updated [docs/reference/supported-technologies.md](../docs/reference/supported-technologies.md)
5151
- [ ] Added an API method or config option? Document in which version this will be introduced
5252

5353
## Related issues

.github/workflows/docs-build.yml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
name: docs-build
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
pull_request_target: ~
8+
merge_group: ~
9+
10+
jobs:
11+
docs-preview:
12+
uses: elastic/docs-builder/.github/workflows/preview-build.yml@main
13+
with:
14+
path-pattern: docs/**
15+
permissions:
16+
deployments: write
17+
id-token: write
18+
contents: read
19+
pull-requests: read

.github/workflows/docs-cleanup.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
name: docs-cleanup
2+
3+
on:
4+
pull_request_target:
5+
types:
6+
- closed
7+
8+
jobs:
9+
docs-preview:
10+
uses: elastic/docs-builder/.github/workflows/preview-cleanup.yml@main
11+
permissions:
12+
contents: none
13+
id-token: write
14+
deployments: write

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
if: ${{ ! startsWith(github.ref, 'refs/tags') }}
4444

4545
- name: generate build provenance
46-
uses: actions/attest-build-provenance@c4fbc648846ca6f503a13a2281a5e7b98aa57202 # v2.0.1
46+
uses: actions/attest-build-provenance@c074443f1aee8d4aeeae555aebba3282517141b2 # v2.2.3
4747
with:
4848
subject-path: "${{ github.workspace }}/pkg/*.gem"
4949

0 commit comments

Comments
 (0)