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.

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

Add auto-updating CHANGELOG.md on develop branch #57

Closed
riyenas0925 opened this issue Aug 13, 2021 · 4 comments · Fixed by #58
Closed

Add auto-updating CHANGELOG.md on develop branch #57

riyenas0925 opened this issue Aug 13, 2021 · 4 comments · Fixed by #58
Assignees
Labels
chore [PR/Issue] Refactoring, maintenance the code

Comments

@riyenas0925
Copy link
Collaborator

riyenas0925 commented Aug 13, 2021

Is your feature request related to a problem? Please describe.

  • Add auto-updating CHANGELOG.md on develop branch

Describe the solution you'd like

  • Currently, only apply automatically to the main branch
  • Using the matrix function of Github actions, both develop and main branches will be applied automatically.
riyenas0925 added a commit to riyenas0925/fosslight that referenced this issue Aug 13, 2021
* Using the matrix function of Github actions, both develop and main branches will be applied automatically.

Resolves fosslight#57

Signed-off-by: riyenas0925 <riyenas0925@gmail.com>
@soimkim soimkim added the chore [PR/Issue] Refactoring, maintenance the code label Aug 13, 2021
riyenas0925 added a commit to riyenas0925/fosslight that referenced this issue Aug 13, 2021
* Using the matrix function of Github actions, both develop and main branches will be applied automatically.

Resolves fosslight#57

Signed-off-by: riyenas0925 <riyenas0925@gmail.com>
@riyenas0925
Copy link
Collaborator Author

@soimkim
There are no conflicts, but I checked that the commits were duplicated.
I'll think of a new way to PR again. Thanks for the feedback 😄

스크린샷 2021-08-13 오후 5 48 13

@riyenas0925
Copy link
Collaborator Author

riyenas0925 commented Aug 13, 2021

@soimkim
I've tried a number of ways, but I'm having problems for the following reasons

case 1

advantages : There is no duplicated of commit
disadvantages : Main Branch is a previous release of changelog

To prevent duplicate commits, if you create a changelog in the develop branch and merge it into the main branch, both branches have the same changelog. However, since the changelog is created after the release has been published, this method ensures that the develop branch has the latest changelog, but the main branch has the changelog of the previous release.
스크린샷 2021-08-14 오전 12 16 29

case 2

advantages : All branches are the latest release of changelog.
disadvantages : Duplicate occurrence of commitment

If you commit the change log in both develop and master branches, it will work as follows, but the same commit will be duplicated when merged into main later.
스크린샷 2021-08-14 오전 12 00 04

case 3

This is a method of adding the changelog to the develop branch before merging in PR and then proceeding with the merge. But it failed because it was before release.

conclusion

I think it would be difficult to change the changelog without committing in the develop branch because all the methods are released in the main branch. Therefore, In the second case, if duplicate commits are displayed separately into Update Changelog on develop branch and Update Changelog on main branch, wouldn't duplication be avoided?

스크린샷 2021-08-14 오전 12 22 56

I'd like to hear from the maintainer Thank you!

@soimkim soimkim linked a pull request Aug 17, 2021 that will close this issue
5 tasks
@soimkim
Copy link
Contributor

soimkim commented Aug 17, 2021

Are you saying that each commit in case 2 is left with a different commit message so it's not a duplicate commit?
That seems like the best way. 👍

riyenas0925 added a commit to riyenas0925/fosslight that referenced this issue Aug 17, 2021
* Using the matrix function of Github actions, both develop and main branches will be applied automatically.

Resolves fosslight#57

Signed-off-by: riyenas0925 <riyenas0925@gmail.com>
@riyenas0925
Copy link
Collaborator Author

@soimkim
Thank you for your comments!

ubermen5che pushed a commit to ubermen5che/fosslight that referenced this issue Oct 16, 2021
* Using the matrix function of Github actions, both develop and main branches will be applied automatically.

Resolves fosslight#57

Signed-off-by: riyenas0925 <riyenas0925@gmail.com>
hyeinlee00 pushed a commit that referenced this issue Jun 18, 2024
Add details api for license/vulnerability (#56)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
chore [PR/Issue] Refactoring, maintenance the code
Projects
None yet
Development

Successfully merging a pull request may close this issue.

2 participants