Skip to content

Commit

Permalink
Merge branch 'main' into add-related-entities
Browse files Browse the repository at this point in the history
  • Loading branch information
romulets authored Aug 27, 2024
2 parents 53dc6fb + 5376570 commit 6ef772b
Show file tree
Hide file tree
Showing 6 changed files with 23 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/docs-preview-comment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
doc-preview:
runs-on: ubuntu-latest
steps:
- uses: actions/github-script@v6
- uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7
name: Add doc preview links
with:
script: |
Expand Down
15 changes: 13 additions & 2 deletions .github/workflows/stale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,21 @@ jobs:

steps:
- name: "Check PRs"
uses: actions/stale@v4
uses: actions/stale@28ca1036281a5e5922ead5184a1bbf96e5fc984e # v9
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
stale-pr-message: 'This PR is stale because it has been open for 60 days with no activity.'
stale-pr-message: |
Hi!
We just realized that we haven't looked into this PR in a while. We're
sorry!
We're labeling this PR as `Stale` to make it hit our filters and
make sure we get back to it as soon as possible. In the meantime, it'd
be extremely helpful if you could take a look at it as well and confirm its
relevance. A simple comment with a nice emoji will be enough `:+1`.
Thank you for your contribution!
stale-pr-label: 'stale'
ascending: true
days-before-pr-stale: 60
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ on: [push, pull_request]

jobs:
tests:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
name: Unit Tests
steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
- uses: actions/setup-python@39cd14951b08e74b54015e9e001cdefcf80e669f # v5
with:
python-version: '3.x'
- run: git fetch --prune --unshallow --tags
Expand Down
4 changes: 2 additions & 2 deletions rfcs/text/0044-add-apple-platform-specific-fields.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# 0000: Name of RFC
# 0044: Apple Platform specific fields
<!-- Leave this ID at 0000. The ECS team will assign a unique, contiguous RFC number upon merging the initial stage of this RFC. -->

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


### Summary
Expand Down
4 changes: 2 additions & 2 deletions scripts/requirements-dev.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# License: MIT
autopep8==1.6.0
# License: BSD
mock==4.0.3
mock==5.1.0
# License: GPLv3
yamllint==1.26.3
yamllint==1.35.1
4 changes: 2 additions & 2 deletions scripts/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
pip
# License: MIT
PyYAML==6.0.1
PyYAML==6.0.2
# License: BSD
gitpython==3.1.41
gitpython==3.1.43
# License: BSD
Jinja2==3.1.4

0 comments on commit 6ef772b

Please sign in to comment.