Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Check additional metadata in projects #14

Merged
merged 11 commits into from
Nov 14, 2024
Merged

Check additional metadata in projects #14

merged 11 commits into from
Nov 14, 2024

Conversation

carlescufi
Copy link
Member

@carlescufi carlescufi commented Oct 28, 2024 •
edited
Loading 

action: Check additional metadata in projects

Until now this action was only looking at differences in revision for
all the projects in the manifest. However, there are other items of
metadata that can be highly sensitive, and changes to those must be
monitored and reported.

This commit introduces additional checks for the following metadata
items:

- URL: part of the manifest, URL to the project repository
- Submodules: part of the manifest, enabled submodules when running west
  update
- West commands: part of the manifest, pointer to a file defining
  extensions commands for west itself
- module.yml: the Zephyr module metadata file

If any of the items above is added, removed or changed, the DNM label
will not be removed from the Pull Request, in order for a human to
decide if the PR is to be merged or not.

Screenshot:

image

@carlescufi carlescufi force-pushed the module-yml branch 2 times, most recently from 0d5a34f to ea11968 Compare October 28, 2024 15:44
@carlescufi
action: Simplify the handling of the GitHub info retrieval
af8a14e 
Instead of digging in the different environment variables, take the
GitHub org, repo and PR number directly from the .yml action file. This
makes it easier to test locally and simplifies the code.

Signed-off-by: Carles Cufi <carles.cufi@nordicsemi.no>
@carlescufi
action: Change a few print() statements into log()
6b40efe 
Use the standard log() infrastructure for all output.

Signed-off-by: Carles Cufi <carles.cufi@nordicsemi.no>
@carlescufi carlescufi force-pushed the module-yml branch 5 times, most recently from 8233dc1 to c2b193f Compare October 29, 2024 14:34
@carlescufi
action: Add a status note
a393354 
In order to clarify to the user why a manifest PR is currently marked as
DNM, add a status line that lists the reason(s) that made the action mark
it as non-mergeable, or OK otherwise.

Signed-off-by: Carles Cufi <carles.cufi@nordicsemi.no>
@carlescufi
action: Add DNM when projects are removed
02d99f4 
Whenever removing a project, add the DNM labels.

Signed-off-by: Carles Cufi <carles.cufi@nordicsemi.no>
@carlescufi
action: Do not check for impostor commits on removed projects
7b1d054 
The new revision is just None, so skip checking for impostor commits.

Signed-off-by: Carles Cufi <carles.cufi@nordicsemi.no>
@carlescufi
action: Refactor the set generation into a function
83fff15 
In preparation for its use in other parts of the code later.

Signed-off-by: Carles Cufi <carles.cufi@nordicsemi.no>
@carlescufi carlescufi force-pushed the module-yml branch 3 times, most recently from 3045c95 to 8b9ae49 Compare October 30, 2024 17:26
@carlescufi
action: Skip manifest project when calculating sets
8112883 
The manifest project will be treated separately in future commits.

Signed-off-by: Carles Cufi <carles.cufi@nordicsemi.no>
@carlescufi carlescufi force-pushed the module-yml branch 2 times, most recently from 4e144e9 to cb03951 Compare October 31, 2024 14:32
@carlescufi
action: Display branch names in monospace
e838c14 
This makes them more visible and easier to spot.

Signed-off-by: Carles Cufi <carles.cufi@nordicsemi.no>
@carlescufi
action: Consolidate the merge status processing
f09f463 
Instead of having multiple sources of truth for the merge (or DNM)
status, use the _get_merge_status() function for both the labeling and
the note.

Signed-off-by: Carles Cufi <carles.cufi@nordicsemi.no>
@carlescufi carlescufi force-pushed the module-yml branch 3 times, most recently from 759dcf8 to 88632d4 Compare November 8, 2024 13:52
@carlescufi carlescufi force-pushed the module-yml branch 2 times, most recently from 94e1610 to c4f8765 Compare November 11, 2024 13:59
@carlescufi carlescufi force-pushed the module-yml branch 11 times, most recently from 54d392f to 1909e09 Compare November 13, 2024 16:26
@carlescufi
action: Check additional metadata in projects
7fad13e 
Until now this action was only looking at differences in revision for
all the projects in the manifest. However, there are other items of
metadata that can be highly sensitive, and changes to those must be
monitored and reported.

This commit introduces additional checks for the following metadata
items:

- URL: part of the manifest, URL to the project repository
- Submodules: part of the manifest, enabled submodules when running west
  update
- West commands: part of the manifest, pointer to a file defining
  extensions commands for west itself
- module.yml: the Zephyr module metadata file

If any of the items above is added, removed or changed, the DNM label
will not be removed from the Pull Request, in order for a human to
decide if the PR is to be merged or not.

Signed-off-by: Carles Cufi <carles.cufi@nordicsemi.no>
@carlescufi carlescufi changed the title Add handling for module.yml changes Check additional metadata in projects Nov 13, 2024
@carlescufi carlescufi mentioned this pull request Nov 13, 2024
Merged
@fabiobaltieri fabiobaltieri merged commit 4419089 into zephyrproject-rtos:main Nov 14, 2024
carlescufi added a commit to carlescufi/zephyr that referenced this pull request Nov 14, 2024
@carlescufi
actions: manifest: check additional metadata in projects
9e63896 
See zephyrproject-rtos/action-manifest#14.

Signed-off-by: Carles Cufi <carles.cufi@nordicsemi.no>
nashif pushed a commit to zephyrproject-rtos/zephyr that referenced this pull request Nov 16, 2024
@carlescufi @nashif
actions: manifest: check additional metadata in projects
a3cc532 
See zephyrproject-rtos/action-manifest#14.

Signed-off-by: Carles Cufi <carles.cufi@nordicsemi.no>
coreboot-bot pushed a commit to coreboot/zephyr-cros that referenced this pull request Nov 18, 2024
actions: manifest: check additional metadata in projects
5ad502a 
See zephyrproject-rtos/action-manifest#14.

(cherry picked from commit a3cc532)

Original-Signed-off-by: Carles Cufi <carles.cufi@nordicsemi.no>
GitOrigin-RevId: a3cc532
Cr-Build-Id: 8731028481084229505
Cr-Build-Url: https://cr-buildbucket.appspot.com/build/8731028481084229505
Copybot-Job-Name: zephyr-main-copybot-downstream
Change-Id: Iae0c9d24e4c554eba76a1b09b1670e3fc50d28c6
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/zephyr/+/6028310
Tested-by: Tristan Honscheid <honscheid@google.com>
Commit-Queue: Tristan Honscheid <honscheid@google.com>
Tested-by: ChromeOS Prod (Robot) <chromeos-ci-prod@chromeos-bot.iam.gserviceaccount.com>
Reviewed-by: Tristan Honscheid <honscheid@google.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nashif nashif nashif approved these changes

@fabiobaltieri fabiobaltieri fabiobaltieri approved these changes

@stephanosio stephanosio stephanosio approved these changes

@gmarull gmarull gmarull approved these changes

@henrikbrixandersen henrikbrixandersen Awaiting requested review from henrikbrixandersen

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@carlescufi @nashif @fabiobaltieri @stephanosio @gmarull