Skip to content

Commit 6ef772b

Browse files
authored
Merge branch 'main' into add-related-entities
2 parents 53dc6fb + 5376570 commit 6ef772b

File tree

6 files changed

+23
-12
lines changed

6 files changed

+23
-12
lines changed

.github/workflows/docs-preview-comment.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
doc-preview:
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/github-script@v6
13+
- uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7
1414
name: Add doc preview links
1515
with:
1616
script: |

.github/workflows/stale.yml

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,21 @@ jobs:
1515

1616
steps:
1717
- name: "Check PRs"
18-
uses: actions/stale@v4
18+
uses: actions/stale@28ca1036281a5e5922ead5184a1bbf96e5fc984e # v9
1919
with:
2020
repo-token: ${{ secrets.GITHUB_TOKEN }}
21-
stale-pr-message: 'This PR is stale because it has been open for 60 days with no activity.'
21+
stale-pr-message: |
22+
Hi!
23+
24+
We just realized that we haven't looked into this PR in a while. We're
25+
sorry!
26+
27+
We're labeling this PR as `Stale` to make it hit our filters and
28+
make sure we get back to it as soon as possible. In the meantime, it'd
29+
be extremely helpful if you could take a look at it as well and confirm its
30+
relevance. A simple comment with a nice emoji will be enough `:+1`.
31+
32+
Thank you for your contribution!
2233
stale-pr-label: 'stale'
2334
ascending: true
2435
days-before-pr-stale: 60

.github/workflows/test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ on: [push, pull_request]
44

55
jobs:
66
tests:
7-
runs-on: ubuntu-20.04
7+
runs-on: ubuntu-22.04
88
name: Unit Tests
99
steps:
10-
- uses: actions/checkout@v2
11-
- uses: actions/setup-python@v2
10+
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
11+
- uses: actions/setup-python@39cd14951b08e74b54015e9e001cdefcf80e669f # v5
1212
with:
1313
python-version: '3.x'
1414
- run: git fetch --prune --unshallow --tags

rfcs/text/0044-add-apple-platform-specific-fields.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
# 0000: Name of RFC
1+
# 0044: Apple Platform specific fields
22
<!-- Leave this ID at 0000. The ECS team will assign a unique, contiguous RFC number upon merging the initial stage of this RFC. -->
33

44
- Stage: **0 (strawperson)** <!-- Update to reflect target stage. See https://elastic.github.io/ecs/stages.html -->
5-
- Date: **TBD** <!-- The ECS team sets this date at merge time. This is the date of the latest stage advancement. -->
5+
- Date: **2024-08-13** <!-- The ECS team sets this date at merge time. This is the date of the latest stage advancement. -->
66

77

88
### Summary

scripts/requirements-dev.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# License: MIT
22
autopep8==1.6.0
33
# License: BSD
4-
mock==4.0.3
4+
mock==5.1.0
55
# License: GPLv3
6-
yamllint==1.26.3
6+
yamllint==1.35.1

scripts/requirements.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
pip
22
# License: MIT
3-
PyYAML==6.0.1
3+
PyYAML==6.0.2
44
# License: BSD
5-
gitpython==3.1.41
5+
gitpython==3.1.43
66
# License: BSD
77
Jinja2==3.1.4

0 commit comments

Comments
 (0)