Skip to content

Commit a964f00

Browse files
authored
Merge branch 'main' into rest5client-sync-interrup-propagation
2 parents 28de62d + d10aae3 commit a964f00

5 files changed

Lines changed: 36 additions & 28 deletions

File tree

.github/workflows/docs-build.yml

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,15 @@
11
name: docs-build
2-
32
on:
3+
pull_request:
4+
types: [opened, synchronize, reopened]
45
push:
5-
branches:
6-
- main
7-
pull_request_target: ~
6+
branches: [main]
87
merge_group: ~
9-
8+
permissions:
9+
contents: read
10+
pull-requests: read
1011
jobs:
11-
docs-preview:
12-
uses: elastic/docs-builder/.github/workflows/preview-build.yml@main
12+
build:
13+
uses: elastic/docs-actions/.github/workflows/docs-build.yml@v1
1314
with:
1415
enable-vale-linting: true
15-
path-pattern: docs/**
16-
permissions:
17-
deployments: write
18-
id-token: write
19-
contents: read
20-
pull-requests: write

.github/workflows/docs-cleanup.yml

Lines changed: 0 additions & 14 deletions
This file was deleted.

.github/workflows/docs-deploy.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
name: docs-deploy
2+
on:
3+
workflow_run:
4+
workflows: [docs-build]
5+
types: [completed]
6+
permissions:
7+
contents: read
8+
deployments: write
9+
id-token: write
10+
pull-requests: write
11+
actions: read
12+
jobs:
13+
deploy:
14+
uses: elastic/docs-actions/.github/workflows/docs-deploy.yml@v1
15+
with:
16+
enable-vale-linting: true
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
name: docs-preview-cleanup
2+
on:
3+
pull_request_target:
4+
types: [closed]
5+
permissions:
6+
contents: none
7+
deployments: write
8+
id-token: write
9+
jobs:
10+
cleanup:
11+
uses: elastic/docs-actions/.github/workflows/docs-preview-cleanup.yml@v1

java-client/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ signing {
180180

181181
dependencies {
182182
val elasticsearchVersion = "9.2.0"
183-
val jacksonVersion = "2.21.1"
183+
val jacksonVersion = "2.21.2"
184184
val jackson3Version = "3.1.0"
185185
val openTelemetryVersion = "1.37.0"
186186

0 commit comments

Comments
 (0)