Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/maintainer_check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,14 @@ jobs:
run: |
pip install -r scripts/requirements-actions.txt --require-hashes

- name: Fetch MAINTAINERS.yml from mainline
- name: Fetch MAINTAINERS.yml from pull request
run: |
git fetch origin main
git show origin/main:MAINTAINERS.yml > mainline_MAINTAINERS.yml
git fetch origin pull/${{ github.event.pull_request.number }}/head
git show FETCH_HEAD:MAINTAINERS.yml > pr_MAINTAINERS.yml

- name: Check maintainer file changes
env:
GITHUB_TOKEN: ${{ secrets.ZB_PR_ASSIGNER_GITHUB_TOKEN }}
run: |
python ./scripts/ci/check_maintainer_changes.py \
--repo zephyrproject-rtos/zephyr mainline_MAINTAINERS.yml MAINTAINERS.yml
--repo zephyrproject-rtos/zephyr MAINTAINERS.yml pr_MAINTAINERS.yml
1 change: 1 addition & 0 deletions MAINTAINERS.yml
Original file line number Diff line number Diff line change
Expand Up @@ -246,6 +246,7 @@ ARM64 arch:
- wearyzen
- ithinuel
- JiafeiPan
- carlocaione
files:
- arch/arm64/
- include/zephyr/arch/arm64/
Expand Down
4 changes: 2 additions & 2 deletions scripts/ci/check_maintainer_changes.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ def check_github_access(usernames, repo_fullname, token):
missing_access = set()
for username in usernames:
try:
collab = repo.get_collaborator_permission(username)
# Permissions: admin, maintain, write, triage, read
collab = repo.get_collaborator_role_name(username)
# Roles: admin, maintain, write, triage, read
if collab not in ("admin", "maintain", "write", "triage"):
missing_access.add(username)
except Exception:
Expand Down
2 changes: 1 addition & 1 deletion scripts/requirements-actions.in
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ natsort
ply>=3.10
psutil>=5.6.6
pyelftools>=0.29
pygithub
pygithub>=2.7.0
pykwalify
pylint>=3
pyserial
Expand Down
14 changes: 4 additions & 10 deletions scripts/requirements-actions.txt
Original file line number Diff line number Diff line change
Expand Up @@ -302,10 +302,6 @@ cryptography==45.0.5 \
--hash=sha256:e74d30ec9c7cb2f404af331d5b4099a9b322a8a6b25c4632755c8757345baac5 \
--hash=sha256:f3562c2f23c612f2e4a6964a61d942f891d29ee320edb62ff48ffb99f3de9ae8
# via pyjwt
deprecated==1.2.18 \
--hash=sha256:422b6f6d859da6f2ef57857761bfb392480502a64c3028ca9bbe86085d72115d \
--hash=sha256:bd5011788200372a32418f888e326a09ff80d0214bd961147cfed01b5c018eec
# via pygithub
dill==0.4.0 \
--hash=sha256:0633f1d2df477324f53a895b02c901fb961bdbf65a17122586ea7019292cbcf0 \
--hash=sha256:44f54bf6412c2c8464c14e8243eb163690a9800dbe2c367330883b19c7561049
Expand Down Expand Up @@ -816,9 +812,9 @@ pyelftools==0.32 \
--hash=sha256:013df952a006db5e138b1edf6d8a68ecc50630adbd0d83a2d41e7f846163d738 \
--hash=sha256:6de90ee7b8263e740c8715a925382d4099b354f29ac48ea40d840cf7aa14ace5
# via -r requirements-actions.in
pygithub==2.6.1 \
--hash=sha256:6f2fa6d076ccae475f9fc392cc6cdbd54db985d4f69b8833a28397de75ed6ca3 \
--hash=sha256:b5c035392991cca63959e9453286b41b54d83bf2de2daa7d7ff7e4312cebf3bf
pygithub==2.8.1 \
--hash=sha256:23a0a5bca93baef082e03411bf0ce27204c32be8bfa7abc92fe4a3e132936df0 \
--hash=sha256:341b7c78521cb07324ff670afd1baa2bf5c286f8d9fd302c1798ba594a5400c9
# via -r requirements-actions.in
pygments==2.19.2 \
--hash=sha256:636cb2477cec7f8952536970bc533bc43743542f70392ae026374600add5b887 \
Expand Down Expand Up @@ -1344,9 +1340,7 @@ wrapt==1.17.2 \
--hash=sha256:f917c1180fdb8623c2b75a99192f4025e412597c50b2ac870f156de8fb101119 \
--hash=sha256:fc78a84e2dfbc27afe4b2bd7c80c8db9bca75cc5b85df52bfe634596a1da846b \
--hash=sha256:ff04ef6eec3eee8a5efef2401495967a916feaa353643defcc03fc74fe213b58
# via
# deprecated
# python-can
# via python-can
xlsxwriter==3.2.5 \
--hash=sha256:4f4824234e1eaf9d95df9a8fe974585ff91d0f5e3d3f12ace5b71e443c1c6abd \
--hash=sha256:7e88469d607cdc920151c0ab3ce9cf1a83992d4b7bc730c5ffdd1a12115a7dbe
Expand Down
Loading