Skip to content

workflow: add 3rd party updates as an exception #1193

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.

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

Merged
merged 3 commits into from
Jan 19, 2020

Conversation

0xc0170
Copy link
Contributor

@0xc0170 0xc0170 commented Jan 2, 2020

Updates like MbedTLS might contain more than just a bugfix. To keep it simple, they should be sent as one PR - version update. Splitting this type of updates makes it difficult to maintain.

This was missing the guidelines - version updates should not be separated. Would it be sufficient to note there as it is now, or rather to dedicate it entire section (also add how to add subtree - as nanostack is doing ?).

@ARMmbed/mbed-os-maintainers Please review

@@ -52,7 +52,7 @@ Pull requests on GitHub have to meet the following requirements to keep the code
- All new features and enhancements require documentation, tests and user guides for us to accept them. Please link each pull request to all relevant documentation and test pull requests.
- Avoid merging commmits. (Always rebase when possible.)
- Comment in the pull request on every change (rebase or new commits). This helps reviewers to be up to date with changes
- Pull requests should fix a bug, add a feature or refactor.
- Pull requests should fix a bug, add a feature or refactor. The only exception are third-party party version updates (for instance MbedTLS or Nanostack releases for Mbed OS).
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

party there twice

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe also add:
These should considered as a library update and contain an updated version, good level of detail documenting what has changed and any impacts on the user.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

updated.

@0xc0170 0xc0170 force-pushed the fix_workflow_3rdparty branch 2 times, most recently from 4e294be to 18b766a Compare January 2, 2020 15:06
@0xc0170
Copy link
Contributor Author

0xc0170 commented Jan 2, 2020

@kjbracey-arm @SeppoTakalo @Patater Please review - as you have updated already external libraries, you got an experience. Have we missed anything?

@SeppoTakalo
Copy link
Contributor

I think this is acceptable exception.

However, I'm not sure whether we maintain changelog for Nanostack, but at least it points to some known release tag in the repository. Short changelog should of course be provided.

@@ -52,7 +52,8 @@ Pull requests on GitHub have to meet the following requirements to keep the code
- All new features and enhancements require documentation, tests and user guides for us to accept them. Please link each pull request to all relevant documentation and test pull requests.
- Avoid merging commmits. (Always rebase when possible.)
- Comment in the pull request on every change (rebase or new commits). This helps reviewers to be up to date with changes
- Pull requests should fix a bug, add a feature or refactor.
- Pull requests should fix a bug, add a feature or refactor.
The only exception are third-party version updates (for instance MbedTLS or Nanostack releases for Mbed OS). These updates should provide release notes for updated version with documentation (a reference to external changelog or release notes).
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Respect the trademark.

- MbedTLS
+ Mbed TLS

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We don't always have a reference to an external changelog or release notes, depending on the library being updated and if the release is a pre-release version.

- These updates should provide release notes for updated version with documentation (a reference to external changelog or release notes).
+ These updates should provide Mbed OS release notes in the pull request description, or link to an external changelog or release notes.

Copy link
Contributor

@kjbracey kjbracey left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm fine with this.

rather to dedicate it entire section (also add how to add subtree - as nanostack is doing ?).

I was considering mentioning that if only as an exception to "avoid merging commits". Don't have any strong feelings either way though. Might be too specialised.

@AnotherButler
Copy link
Contributor

@Patater Does this look better?
@0xc0170 Could you please rebase?

@Patater
Copy link
Contributor

Patater commented Jan 16, 2020

@Patater Does this look better?

Should we make this change?

- The only exception are third-party version updates
+ The only exceptions are third-party version updates

or perhaps this one?

- The only exception are third-party version updates
+ The only exception is third-party version updates

@0xc0170
Copy link
Contributor Author

0xc0170 commented Jan 17, 2020

I'll rebase and fix soon

0xc0170 and others added 3 commits January 17, 2020 08:10
Updates like MbedTLS might contain more than just a bugfix. To keep it simple, they should be sent as one PR - version
update. Splitting this type of updates makes it difficult to maintain.

It should be stated what version we are getting and a reference to release notes (changelog could be - what this brings in).
Fix phrasing, as requested in comments.
Fix phrasing for agreement.
@0xc0170 0xc0170 force-pushed the fix_workflow_3rdparty branch from 849c74f to a80422b Compare January 17, 2020 08:11
@0xc0170
Copy link
Contributor Author

0xc0170 commented Jan 17, 2020

All updated. This should be now ready for integration

@AnotherButler AnotherButler merged commit e7b9991 into ARMmbed:development Jan 19, 2020
AnotherButler pushed a commit that referenced this pull request Jan 19, 2020
Apply changes from PR #1193 to v5.15.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants