Skip to content

Commit ceea749

Browse files
authored
Merge branch 'main' into dependabot/pip/tests/requirements/requests-2.33.0
2 parents 3316896 + f35364c commit ceea749

9 files changed

Lines changed: 40 additions & 32 deletions

File tree

.github/workflows/build-images.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- uses: actions/checkout@v6
2323

2424
- name: Login to ghcr.io
25-
uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4.0.0
25+
uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4.1.0
2626
with:
2727
registry: ${{ env.REGISTRY }}
2828
username: ${{ github.actor }}

.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

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ jobs:
129129
cache-binary: false
130130

131131
- name: Log in to the Elastic Container registry
132-
uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4.0.0
132+
uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4.1.0
133133
with:
134134
registry: ${{ secrets.ELASTIC_DOCKER_REGISTRY }}
135135
username: ${{ secrets.ELASTIC_DOCKER_USERNAME }}

.github/workflows/updatecli.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
permission-contents: write
2727
permission-pull-requests: write
2828

29-
- uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4.0.0
29+
- uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4.1.0
3030
with:
3131
registry: ghcr.io
3232
username: ${{ github.actor }}

.tool-versions

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
updatecli v0.114.0
1+
updatecli v0.115.0

tests/contrib/django/django_tests.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -572,7 +572,7 @@ def test_post_raw_data(django_elasticapm_client):
572572
def test_post_read_error_logging(django_elasticapm_client, caplog, rf):
573573
request = rf.post("/test", data="{}", content_type="application/json")
574574

575-
def read():
575+
def read(*args, **kwargs):
576576
raise IOError("foobar")
577577

578578
request.read = read

0 commit comments

Comments
 (0)