fix(ci): improve attribution of co-authors #4104
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 tasks
thomaseizinger
changed the title
Co-authored-by
thomaseizinger
approved these changes
Jun 23, 2023
I was bothered with the empty lines too, although so far I considered it to be purely cosmetic. I did open a discussion upstream already but hadn't had the time yet to try it out: Mergifyio/mergify#5091 I used https://j2live.ttl255.com/ in the past to test out the template rendering without having to iterate by merging PRs. The |
thomaseizinger
changed the title
Co-authored-by
|
Argh, I forgot that mergify doesn't support updating variables within a loop. |
|
Yey! I think I managed to get this to work! |
4 tasks
thomaseizinger
added a commit
that referenced
this pull request
Jun 27, 2023
Unfortunately, the automated contribution message does not work properly. To evaluate this correctly, we need to first filter out all merge commits. To do this, we need to check the length of the `parents` property. I did not find a way to do this with jinja2 filters. Which would allow us to do something like `rejectattr`. In the code snippet removed in this PR, I attempted to create a property to filter the merge commits on. This also doesn't work because the underlying object exposed by mergify is not a dictionary but a class and thus does not have the `update` function. Mergify is shipping an additional property next month: Mergifyio/mergify#4636 (reply in thread). Thus, I am replacing this automated mechanism with a manual section that we can add to the PR until mergify ships the additional property that we can utilize to implement this in a clean way. Related: #4130. Related: #4104. Pull-Request: #4131.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Fix the
Co-authored-byinclusion in commit messages so that co-authorship is properly expressed. Additionally, filter merge commits before unique authors. Previously, we would not attribute an author if their first commit in a PR was a merge commit. Finally, we remove superfluous newlines between theCo-authored-bylines.Notes & open questions
Change checklist