add merged at for git pullrequest struct #565
Open
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
yuzp1996
force-pushed
the
feat/notifact-wrong-pr-author
branch
2 times, most recently
from
46a735e to
9df87c3
Compare
danielfbm
reviewed
Mar 29, 2024
| @@ -155,4 +155,7 @@ type BuildGitPullRequestStatus struct { | |||
| HasConflicts bool `json:"hasConflicts" variable:"example=false"` | |||
| // MergedBy indicates pr was merged by user use email | |||
| MergedBy GitUserBaseInfo `json:"mergedBy,omitempty" variable:"[email protected]"` | |||
| // +optional | |||
| // MergedAt indicates when the pr was merged | |||
yuzp1996
force-pushed
the
feat/notifact-wrong-pr-author
branch
3 times, most recently
from
4559721 to
3af42ad
Compare
yuzp1996
force-pushed
the
feat/notifact-wrong-pr-author
branch
from
3af42ad to
d02551b
Compare
yuzp1996
commented
Mar 31, 2024
| @@ -154,5 +154,7 @@ type BuildGitPullRequestStatus struct { | |||
| // +optional | |||
| HasConflicts bool `json:"hasConflicts" variable:"example=false"` | |||
| // MergedBy indicates pr was merged by user use email | |||
| MergedBy GitUserBaseInfo `json:"mergedBy,omitempty" variable:"[email protected]"` | |||
| MergedBy GitUserBaseInfoWithoutVariable `json:"mergedBy,omitempty" variable:"-"` | |||
There was a problem hiding this comment.
merge 相关的数据 mergedBy mergedAt 目前不适合作为参数存在
PR 触发的时候，不会有 PR merge 的信息
PR 合并的时候 此时也不会触发 PR 的构建
因此产品中即使提供了这几个参数，也永远用不到
目前 merge 的信息只有在 lastCommit 相关的 PR 中会用到，但是他们不会被转成变量
所以这里把 merge 相关的两个参数 mergedBy mergedAt 的 variable 都去掉了
另外之前添加的 mergedBy 参数，没有增加对应的变量函数，算是一个 bug，这里也正好处理掉了
yuzp1996
commented
Mar 31, 2024
| } | ||
|
|
||
| // GitUserBaseInfoWithoutVariable user base info without variable | ||
| type GitUserBaseInfoWithoutVariable struct { |
There was a problem hiding this comment.
目前只有当 variable 为 “-” 时不会作为变量展示，所以新增了一个结构体 GitUserBaseInfoWithoutVariable，和 GitUserBaseInfo 结构一样，只不过 variable 都为 "-"
我还考虑过修改参数的处理逻辑，当 root 节点 variable 为 ”-“ 时，不处理 root 节点下子节点的参数，但是看起来不太通用，覆盖的场景更少，因此选择当前的办法
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.
Changes
Submitter Checklist
As the author of this PR, please check off the items in this checklist:
specPR link includedfunctionality, content, code)
Release Notes