diff --git a/config/config.yaml b/config/config.yaml index 09ed718..4f44473 100644 --- a/config/config.yaml +++ b/config/config.yaml @@ -28,7 +28,6 @@ settings: # - collaborator # - owner # - member - # Who else do we consider to be a project member? Default is empty. #members: # - tstromberg @@ -82,7 +81,7 @@ collections: name: "Receive queue" description: > Issues that may be waiting for our response - + NOTE: for this to work properly, GitHub token must have read access to read organization members rules: - question-recv @@ -144,10 +143,10 @@ rules: - label: "!needs-rebase" - label: "!.*wip" - label: "!cncf-cla: no" - - tag: "!requested-changes" + - tag: "!changes-requested" - tag: "!send" - tag: "!commented" - + # Temporarily workaround inability to track PR eligibility - updated: +1d @@ -289,7 +288,7 @@ rules: - created: +20d - updated: +5d - responded: +2d - + ## Bug Scrub ## question-old: name: "Questions that have been open for >3 weeks" @@ -365,7 +364,7 @@ rules: - label: "!.*(feature|enhancement).*" - label: "!.*bug" - label: ".*question" - + # P0 p0-features: name: "p0 Bugs" diff --git a/config/examples/kubernetes.yaml b/config/examples/kubernetes.yaml index 62656ff..2a3ab60 100644 --- a/config/examples/kubernetes.yaml +++ b/config/examples/kubernetes.yaml @@ -26,12 +26,10 @@ settings: # - collaborator # - owner # - member - # Who else do we consider to be a project member? Default is empty. #members: # - tstromberg - collections: - id: daily name: Daily Triage @@ -97,7 +95,7 @@ collections: name: "Receive queue" description: > Issues that may be waiting for our response - + NOTE: for this to work properly, GitHub token must have read access to read organization members rules: - question-recv @@ -119,7 +117,7 @@ collections: - soon-features - soon-bugs - soon-other - + - id: similar name: Similar description: Items which appear similar to one other. Review for duplicates or vague titles. @@ -135,7 +133,6 @@ collections: - open-prs - open-issues - rules: ### Daily Triage #### issue-needs-priority-overdue: @@ -181,10 +178,8 @@ rules: - label: "!do-not-merge.*" - label: "!needs-rebase" - label: "!cncf-cla: no" - - tag: "!requested-changes" + - tag: "!changes-requested" - tag: "!send" - # Temporarily workaround inability to track PR eligibility - - updated: +1d # Issues missing initial feedback issue-needs-kind: @@ -243,16 +238,16 @@ rules: - tag: recv issue-updated-has-question: - name: "Recently updated issue has a question" - resolution: "Add an answer" - type: issue - filters: - - tag: recv-q - - label: "!triage/needs-information" - - tag: "!member-last" - - tag: "!contributor-last" - - responded: +3d - - updated: -7d + name: "Recently updated issue has a question" + resolution: "Add an answer" + type: issue + filters: + - tag: recv-q + - label: "!triage/needs-information" + - tag: "!member-last" + - tag: "!contributor-last" + - responded: +3d + - updated: -7d ####### Weekly Triage ######### # SLO nearing diff --git a/config/examples/minikube.yaml b/config/examples/minikube.yaml index 1a8d114..0a6f0a3 100644 --- a/config/examples/minikube.yaml +++ b/config/examples/minikube.yaml @@ -186,7 +186,7 @@ rules: type: issue filters: - tag: open-milestone - - tag: "(pr-approved|pr-approved-but-pushed)" + - tag: "(pr-approved|pr-approved-but-pushed)" milestone-closed: name: "Finish Line" type: issue @@ -240,7 +240,7 @@ rules: - label: "!do-not-merge.*" - label: "!needs-rebase" - label: "!cncf-cla: no" - - tag: "!requested-changes" + - tag: "!changes-requested" - tag: "!send" # Temporarily workaround inability to track PR eligibility - updated: +1d diff --git a/config/examples/skaffold.yaml b/config/examples/skaffold.yaml index 05b4323..b9e513b 100644 --- a/config/examples/skaffold.yaml +++ b/config/examples/skaffold.yaml @@ -16,7 +16,7 @@ settings: name: skaffold min_similarity: 0.8 repos: - - https://github.com/GoogleContainerTools/skaffold + - https://github.com/GoogleContainerTools/skaffold collections: - id: daily @@ -215,14 +215,12 @@ rules: type: pull_request filters: - label: "!do-not-merge.*" - - label: "!needs-rebase" - label: "!.*wip" - label: "!cncf-cla: no" - title: "!.*WIP.*" - tag: "!draft" - - tag: "!requested-changes" - - tag: "!send" - - tag: "!commented" + - tag: "(new-commits|unreviewed)" + - tag: "recv" - updated: +1d # Issues missing initial feedback @@ -242,7 +240,7 @@ rules: - label: "!area/.*" - label: "!meta/.*" # Open question: should this exclude questions? - # - label: "!kind/question" + # - label: "!kind/question" issue-needs-priority: name: "Unprioritized bugs or features" @@ -298,15 +296,15 @@ rules: - tag: recv issue-updated-has-question: - name: "Recently updated issue has open question" - resolution: "Add an answer" - type: issue - filters: - - tag: recv-q - - tag: "!member-last" - - tag: "!contributor-last" - - responded: +3d - - updated: -7d + name: "Recently updated issue has open question" + resolution: "Add an answer" + type: issue + filters: + - tag: recv-q + - tag: "!member-last" + - tag: "!contributor-last" + - responded: +3d + - updated: -7d ####### Weekly Triage ######### discuss: @@ -413,7 +411,7 @@ rules: type: issue filters: - label: needs-reproduction - - responded: +1w + - responded: +1w - updated: +21d issue-stale-support: @@ -465,7 +463,7 @@ rules: - updated: +5d - responded: +2d - label: "!triage/discuss" - + # People with questions issue-has-question: name: "Reporter asked a question over a week ago" diff --git a/deploy/kubernetes/configmap.yaml b/deploy/kubernetes/configmap.yaml index 9190a46..a2f9fcd 100644 --- a/deploy/kubernetes/configmap.yaml +++ b/deploy/kubernetes/configmap.yaml @@ -6,432 +6,432 @@ metadata: data: # The contents of config/config.yaml config.yaml: | - settings: - name: generic-project - min_similarity: 0.75 - repos: - - https://github.com/photoprism/photoprism - collections: - - id: daily - name: Daily Triage - dedup: false - description: To be emptied out daily - rules: - - issue-needs-comment - - p0-fix-overdue - - p0-followup-overdue - # Don't leave code reviews hanging - - pr-reviewable - # missing initial feedback - - issue-needs-kind - # reprioritize - - issue-new-with-reactions - - issue-new-with-many-commenters - # Don't forget our users - - issue-has-question - - issue-updated-kind-question - - - id: weekly - name: Weekly Triage - dedup: true - description: To be emptied out weekly - rules: - - discuss - # Issues needing reprioritization - - many-reactions - - many-commenters - # Issues needing reprioritization - - issue-zombies - # PR's needing closure - - pr-approved-stale - - pr-unapproved-stale - - birthday - - - id: quarterly - name: Quarterly Scrub - dedup: true - rules: - - question-old - - bugs-old - - enhancement-old - - other-old - - - id: recv - name: "Receive queue" - description: > - Issues that may be waiting for our response - - NOTE: for this to work properly, GitHub token must have read access to read organization members - rules: - - question-recv - - bugs-recv - - enhancement-recv - - other-recv - - - id: p0 - name: P0 - description: All hands on deck! - rules: - - p0-prs - - p0-features - - p0-bugs - - p0-other - - - id: p1 - name: P1 - description: To be resolved within 6 weeks - rules: - - p1-prs - - p1-features - - p1-bugs - - p1-other - - - id: similar - name: Similar - description: Items which appear similar to one other. Review for duplicates or vague titles. - rules: - - similar-prs - - similar-issues - - - id: open - name: All open PR's and Issues that should be considered for repository stats (hidden) - used_for_statistics: true - hidden: true - rules: - - open-prs - - open-issues - + settings: + name: generic-project + min_similarity: 0.75 + repos: + - https://github.com/photoprism/photoprism + collections: + - id: daily + name: Daily Triage + dedup: false + description: To be emptied out daily rules: - ### Daily Triage #### - issue-needs-comment: - name: "Unresponded, older than 7 days" - resolution: "Respond to the issue" - type: issue - filters: - - tag: "!commented" - - tag: "recv" - - created: +1w - + - issue-needs-comment + - p0-fix-overdue + - p0-followup-overdue # Don't leave code reviews hanging - pr-reviewable: - name: "Pull Requests: Review Ready" - resolution: "Review requests or mark them as do-not-merge/work-in-progress" - type: pull_request - filters: - - label: "!do-not-merge.*" - - label: "!needs-rebase" - - label: "!.*wip" - - label: "!cncf-cla: no" - - tag: "!requested-changes" - - tag: "!send" - - tag: "!commented" - - # Temporarily workaround inability to track PR eligibility - - updated: +1d - - # Issues missing initial feedback - issue-needs-kind: - name: "Unkinded Issues" - resolution: "Add a label" - type: issue - filters: - - label: "!.*(kind|bug|documentation|enhancement|question|todo|idea|epic).*" - - # Issues that may need reprioritized - issue-new-with-reactions: - name: "New, has multiple reactions, but not p0" - resolution: "Check if issue should be prioritized as p0" - type: issue - filters: - - reactions: ">2" - - created: -10d - - tag: "!send" - - label: "!priority/p0" - - issue-new-with-many-commenters: - name: "New, has multiple commenters, but not p0" - resolution: "Check if issue should be prioritized as p0" - type: issue - filters: - - commenters: ">3" - - created: -10d - - tag: "!send" - - label: "!priority/p0" - - # People with questions - issue-updated-kind-question: - name: "question label issue not responded to for over a week" - resolution: "Remove question label, or add a comment" - type: issue - filters: - - tag: recv - - label: ".*question" - - tag: "!member-last" - - tag: "!contributor-last" - - responded: +8d - - issue-has-question: - name: "Reporter asked a question over a week ago" - resolution: "Add an answer" - type: issue - filters: - - tag: recv-q - - tag: "!member-last" - - tag: "!contributor-last" - - responded: +7d - - ####### Weekly Triage ######### - discuss: - name: "Items for discussion" - resolution: "Discuss and remove label" - filters: - - label: ".*discuss" - - state: "all" - - # SLO nearing - p0-followup-overdue: - name: "p0 issue, no comments in 3 days" - resolution: "Downgrade to p1" - type: issue - filters: - - label: "priority/p0" - - tag: recv - - responded: +3d - - p0-fix-overdue: - name: "p0 bug, older than 7 days" - resolution: "Downgrade to p1" - type: issue - filters: - - label: "priority/p0" - - created: +7d - - # issues needing reprioritization - many-reactions: - name: "many reactions, low priority, no recent comment" - resolution: "Bump the priority, add a comment" - filters: - - reactions: ">3" - - reactions-per-month: ">1" - - label: "!priority/p0" - - label: "!priority/p1" - - responded: +60d - - many-commenters: - name: "many commenters, low priority, no recent comment" - resolution: "Consider increasing priority" - type: issue - filters: - - commenters: ">3" - - commenters-per-month: ">1.9" - - created: "+30d" - - label: "!priority/p0" - - label: "!priority/p1" - - tag: "!member-last" - - responded: "+60d" - - issue-zombies: - name: "Screaming into the void" - resolution: "Reopen, or ask folks to open a new issue" - type: issue - filters: - - state: closed - - comments-while-closed: ">1" - - updated: "-14d" - - tag: "!member-last" - - # Issues needing closure - birthday: - name: "Forgotten Birthdays - over a year old, no response in 6 months" - resolution: "Close or comment on what it would take to address this issue" - filters: - - created: +365d - - responded: +180d - + - pr-reviewable + # missing initial feedback + - issue-needs-kind + # reprioritize + - issue-new-with-reactions + - issue-new-with-many-commenters + # Don't forget our users + - issue-has-question + - issue-updated-kind-question + + - id: weekly + name: Weekly Triage + dedup: true + description: To be emptied out weekly + rules: + - discuss + # Issues needing reprioritization + - many-reactions + - many-commenters + # Issues needing reprioritization + - issue-zombies # PR's needing closure - pr-approved-stale: - name: "Pull requests: Approved and getting old" - type: pull_request - filters: - - label: "!do-not-merge.*" - - label: "!needs-rebase" - - label: "approved" - - updated: +5d - - responded: +2d - - pr-unapproved-stale: - name: "Pull Requests: Stale" - resolution: "Add comment and/or close PR" - type: pull_request - filters: - - created: +20d - - updated: +5d - - responded: +2d - - ## Bug Scrub ## - question-old: - name: "Questions that have been open for >3 weeks" - resolution: "Comment or close the issue" - type: issue - filters: - - responded: +7d - - created: +21d - - label: ".*question" - - enhancement-old: - name: "Features that have been commented on within 90 days" - resolution: "Comment or close the issue" - type: issue - filters: - - responded: +1d - - created: +1d - - label: ".*(feature|enhancement|idea).*" - - bugs-old: - name: "Bugs that have not been commented on within 90 days" - resolution: "Comment or close the issue" - type: issue - filters: - - label: ".*bug.*" - - responded: +1d - - created: +1d - - label: "!priority/awaiting-evidence" - - other-old: - name: "Other items that have not been commented on within 90 days" - resolution: "Comment or close the issue" - type: issue - filters: - - responded: +1d - - created: +1d - - label: "!.*question" - - label: "!.*(feature|enhancement).*" - - label: "!.*bug" - - # Receive queue - question-recv: - name: "Questions awaiting follow-up" - resolution: "Comment or close the issue" - type: issue - filters: - - tag: recv - - label: ".*question" - - bugs-recv: - name: "Bugs awaiting follow-up" - resolution: "Comment or close the issue" - type: issue - filters: - - tag: recv - - label: ".*bug" - - enhancement-recv: - name: "Features awaiting follow-up" - resolution: "Comment or close the issue" - type: issue - filters: - - tag: recv - - label: ".*(feature|enhancement|idea).*" - - other-recv: - name: "Items that deserve a follow-up comment" - resolution: "Comment or close the issue" - type: issue - filters: - - tag: recv - - responded: +30d - - label: "!.*(feature|enhancement).*" - - label: "!.*bug" - - label: ".*question" + - pr-approved-stale + - pr-unapproved-stale + - birthday + + - id: quarterly + name: Quarterly Scrub + dedup: true + rules: + - question-old + - bugs-old + - enhancement-old + - other-old + + - id: recv + name: "Receive queue" + description: > + Issues that may be waiting for our response + + NOTE: for this to work properly, GitHub token must have read access to read organization members + rules: + - question-recv + - bugs-recv + - enhancement-recv + - other-recv + + - id: p0 + name: P0 + description: All hands on deck! + rules: + - p0-prs + - p0-features + - p0-bugs + - p0-other + + - id: p1 + name: P1 + description: To be resolved within 6 weeks + rules: + - p1-prs + - p1-features + - p1-bugs + - p1-other + + - id: similar + name: Similar + description: Items which appear similar to one other. Review for duplicates or vague titles. + rules: + - similar-prs + - similar-issues + + - id: open + name: All open PR's and Issues that should be considered for repository stats (hidden) + used_for_statistics: true + hidden: true + rules: + - open-prs + - open-issues + + rules: + ### Daily Triage #### + issue-needs-comment: + name: "Unresponded, older than 7 days" + resolution: "Respond to the issue" + type: issue + filters: + - tag: "!commented" + - tag: "recv" + - created: +1w + + # Don't leave code reviews hanging + pr-reviewable: + name: "Pull Requests: Review Ready" + resolution: "Review requests or mark them as do-not-merge/work-in-progress" + type: pull_request + filters: + - label: "!do-not-merge.*" + - label: "!needs-rebase" + - label: "!.*wip" + - label: "!cncf-cla: no" + - tag: "!changes-requested" + - tag: "!send" + - tag: "!commented" - # P0 - p0-features: - name: "p0 Bugs" - type: issue - resolution: Close or deprioritize - filters: - - label: "priority/p0" - - label: "kind/bug" - - p0-bugs: - name: "p0 Features" - type: issue - resolution: Close or deprioritize - filters: - - label: "priority/p0" - - label: "kind/feature-request" - - p0-other: - name: "p0 Other" - type: issue - resolution: Close or deprioritize - filters: - - label: "priority/p0" - - label: "!kind/feature-request" - - label: "!kind/bug" - - p0-prs: - name: "p0 Pull Requests" - type: pull_request - resolution: Merge em - filters: - - label: "priority/p0" - - # P1 - p1-bugs: - name: "p1 Bugs" - type: issue - resolution: Close or deprioritize - filters: - - label: "priority/p1" - - label: "kind/bug" - - p1-features: - name: "p1 Features" - type: issue - resolution: Close or deprioritize - filters: - - label: "priority/p1" - - label: "kind/feature-request" - - p1-other: - name: "p1 Other" - type: issue - resolution: Close or deprioritize - filters: - - label: "priority/p1" - - label: "!kind/feature-request" - - label: "!kind/bug" - - p1-prs: - name: "p1 Pull Requests" - type: pull_request - resolution: Merge em - filters: - - label: "priority/p1" - - ## Similar - similar-prs: - name: "Similar Pull Requests" - type: pull_request - resolution: Close as duplicate or give a better title - filters: - - tag: similar - - similar-issues: - name: "Similar Issues" - type: issue - resolution: Close as duplicate or give a better title - filters: - - tag: similar - - # for statistics generation - open-issues: - name: "Open Issues" - type: issue - state: open - - open-prs: - name: "Open PRs" - type: pull_request - state: open + # Temporarily workaround inability to track PR eligibility + - updated: +1d + + # Issues missing initial feedback + issue-needs-kind: + name: "Unkinded Issues" + resolution: "Add a label" + type: issue + filters: + - label: "!.*(kind|bug|documentation|enhancement|question|todo|idea|epic).*" + + # Issues that may need reprioritized + issue-new-with-reactions: + name: "New, has multiple reactions, but not p0" + resolution: "Check if issue should be prioritized as p0" + type: issue + filters: + - reactions: ">2" + - created: -10d + - tag: "!send" + - label: "!priority/p0" + + issue-new-with-many-commenters: + name: "New, has multiple commenters, but not p0" + resolution: "Check if issue should be prioritized as p0" + type: issue + filters: + - commenters: ">3" + - created: -10d + - tag: "!send" + - label: "!priority/p0" + + # People with questions + issue-updated-kind-question: + name: "question label issue not responded to for over a week" + resolution: "Remove question label, or add a comment" + type: issue + filters: + - tag: recv + - label: ".*question" + - tag: "!member-last" + - tag: "!contributor-last" + - responded: +8d + + issue-has-question: + name: "Reporter asked a question over a week ago" + resolution: "Add an answer" + type: issue + filters: + - tag: recv-q + - tag: "!member-last" + - tag: "!contributor-last" + - responded: +7d + + ####### Weekly Triage ######### + discuss: + name: "Items for discussion" + resolution: "Discuss and remove label" + filters: + - label: ".*discuss" + - state: "all" + + # SLO nearing + p0-followup-overdue: + name: "p0 issue, no comments in 3 days" + resolution: "Downgrade to p1" + type: issue + filters: + - label: "priority/p0" + - tag: recv + - responded: +3d + + p0-fix-overdue: + name: "p0 bug, older than 7 days" + resolution: "Downgrade to p1" + type: issue + filters: + - label: "priority/p0" + - created: +7d + + # issues needing reprioritization + many-reactions: + name: "many reactions, low priority, no recent comment" + resolution: "Bump the priority, add a comment" + filters: + - reactions: ">3" + - reactions-per-month: ">1" + - label: "!priority/p0" + - label: "!priority/p1" + - responded: +60d + + many-commenters: + name: "many commenters, low priority, no recent comment" + resolution: "Consider increasing priority" + type: issue + filters: + - commenters: ">3" + - commenters-per-month: ">1.9" + - created: "+30d" + - label: "!priority/p0" + - label: "!priority/p1" + - tag: "!member-last" + - responded: "+60d" + + issue-zombies: + name: "Screaming into the void" + resolution: "Reopen, or ask folks to open a new issue" + type: issue + filters: + - state: closed + - comments-while-closed: ">1" + - updated: "-14d" + - tag: "!member-last" + + # Issues needing closure + birthday: + name: "Forgotten Birthdays - over a year old, no response in 6 months" + resolution: "Close or comment on what it would take to address this issue" + filters: + - created: +365d + - responded: +180d + + # PR's needing closure + pr-approved-stale: + name: "Pull requests: Approved and getting old" + type: pull_request + filters: + - label: "!do-not-merge.*" + - label: "!needs-rebase" + - label: "approved" + - updated: +5d + - responded: +2d + + pr-unapproved-stale: + name: "Pull Requests: Stale" + resolution: "Add comment and/or close PR" + type: pull_request + filters: + - created: +20d + - updated: +5d + - responded: +2d + + ## Bug Scrub ## + question-old: + name: "Questions that have been open for >3 weeks" + resolution: "Comment or close the issue" + type: issue + filters: + - responded: +7d + - created: +21d + - label: ".*question" + + enhancement-old: + name: "Features that have been commented on within 90 days" + resolution: "Comment or close the issue" + type: issue + filters: + - responded: +1d + - created: +1d + - label: ".*(feature|enhancement|idea).*" + + bugs-old: + name: "Bugs that have not been commented on within 90 days" + resolution: "Comment or close the issue" + type: issue + filters: + - label: ".*bug.*" + - responded: +1d + - created: +1d + - label: "!priority/awaiting-evidence" + + other-old: + name: "Other items that have not been commented on within 90 days" + resolution: "Comment or close the issue" + type: issue + filters: + - responded: +1d + - created: +1d + - label: "!.*question" + - label: "!.*(feature|enhancement).*" + - label: "!.*bug" + + # Receive queue + question-recv: + name: "Questions awaiting follow-up" + resolution: "Comment or close the issue" + type: issue + filters: + - tag: recv + - label: ".*question" + + bugs-recv: + name: "Bugs awaiting follow-up" + resolution: "Comment or close the issue" + type: issue + filters: + - tag: recv + - label: ".*bug" + + enhancement-recv: + name: "Features awaiting follow-up" + resolution: "Comment or close the issue" + type: issue + filters: + - tag: recv + - label: ".*(feature|enhancement|idea).*" + + other-recv: + name: "Items that deserve a follow-up comment" + resolution: "Comment or close the issue" + type: issue + filters: + - tag: recv + - responded: +30d + - label: "!.*(feature|enhancement).*" + - label: "!.*bug" + - label: ".*question" + + # P0 + p0-features: + name: "p0 Bugs" + type: issue + resolution: Close or deprioritize + filters: + - label: "priority/p0" + - label: "kind/bug" + + p0-bugs: + name: "p0 Features" + type: issue + resolution: Close or deprioritize + filters: + - label: "priority/p0" + - label: "kind/feature-request" + + p0-other: + name: "p0 Other" + type: issue + resolution: Close or deprioritize + filters: + - label: "priority/p0" + - label: "!kind/feature-request" + - label: "!kind/bug" + + p0-prs: + name: "p0 Pull Requests" + type: pull_request + resolution: Merge em + filters: + - label: "priority/p0" + + # P1 + p1-bugs: + name: "p1 Bugs" + type: issue + resolution: Close or deprioritize + filters: + - label: "priority/p1" + - label: "kind/bug" + + p1-features: + name: "p1 Features" + type: issue + resolution: Close or deprioritize + filters: + - label: "priority/p1" + - label: "kind/feature-request" + + p1-other: + name: "p1 Other" + type: issue + resolution: Close or deprioritize + filters: + - label: "priority/p1" + - label: "!kind/feature-request" + - label: "!kind/bug" + + p1-prs: + name: "p1 Pull Requests" + type: pull_request + resolution: Merge em + filters: + - label: "priority/p1" + + ## Similar + similar-prs: + name: "Similar Pull Requests" + type: pull_request + resolution: Close as duplicate or give a better title + filters: + - tag: similar + + similar-issues: + name: "Similar Issues" + type: issue + resolution: Close as duplicate or give a better title + filters: + - tag: similar + + # for statistics generation + open-issues: + name: "Open Issues" + type: issue + state: open + + open-prs: + name: "Open PRs" + type: pull_request + state: open diff --git a/docs/config.md b/docs/config.md index 0f98f8c..e277174 100644 --- a/docs/config.md +++ b/docs/config.md @@ -113,3 +113,13 @@ Triage Party has an automatic tagging mechanism that adds annotations which can * `closed`: the issue or PR has been closed * `similar`: the issue or PR appears to be similar to another * `new-commits`: the PR has new commits since the last member response + +To determine review state, we support the following tags: + +* `approved`: Last review was an approval +* `reviewed-with-comment`: Last review was a comment +* `changes-requested`: Last review was a request for changes +* `unreviewed`: PR has never been reviewed +* `pushed-after-approval`: PR was pushed to after approval + +The afforementioned PR review tags are also added to linked issues, though with a `pr-` prefix. For instance, `pr-approved`. diff --git a/pkg/hubbub/search.go b/pkg/hubbub/search.go index bda4614..5ff73a1 100644 --- a/pkg/hubbub/search.go +++ b/pkg/hubbub/search.go @@ -174,7 +174,7 @@ func (h *Engine) timelineDate(i GitHubItem) time.Time { latestXref := h.latestXref[i.GetHTMLURL()] if latestXref.After(updatedAt) { - klog.Infof("%s was coss-referenced at %s, after last update %s", i.GetHTMLURL(), latestXref, updatedAt) + klog.Infof("%s was cross-referenced at %s, after last update %s", i.GetHTMLURL(), latestXref, updatedAt) updatedAt = latestXref } else if !latestXref.IsZero() { klog.V(3).Infof("%s was cross-referenced at %s, before last update %s", i.GetHTMLURL(), latestXref, updatedAt) diff --git a/pkg/hubbub/timeline.go b/pkg/hubbub/timeline.go index 9e66c3f..626512c 100644 --- a/pkg/hubbub/timeline.go +++ b/pkg/hubbub/timeline.go @@ -118,11 +118,10 @@ func (h *Engine) addEvents(ctx context.Context, co *Conversation, timeline []*gi ref := h.prRef(ctx, ri) co.PullRequestRefs = append(co.PullRequestRefs, ref) - co.Tags = append(co.Tags, Tag{ - ID: fmt.Sprintf("pr-%s", strings.ToLower(strings.Replace(ref.ReviewState, "_", "-", -1))), - Description: fmt.Sprintf("Issue has a cross-referenced PR in state %s", co.ReviewState), - }) - + refTag := reviewStateTag(ref.ReviewState) + refTag.ID = fmt.Sprintf("pr-%s", refTag.ID) + refTag.Description = fmt.Sprintf("cross-referenced PR: %s", refTag.Description) + co.Tags = append(co.Tags, refTag) } else { co.IssueRefs = append(co.IssueRefs, h.issueRef(t.GetSource().GetIssue())) } diff --git a/pkg/site/site.go b/pkg/site/site.go index 1984ca1..d7d7ed1 100644 --- a/pkg/site/site.go +++ b/pkg/site/site.go @@ -37,7 +37,7 @@ import ( ) // VERSION is what version of Triage Party we advertise as. -const VERSION = "v1.2.0-beta" +const VERSION = "v1.2.0-beta.1" var ( nonWordRe = regexp.MustCompile(`\W`) @@ -245,7 +245,7 @@ func playerFilter(result *triage.CollectionResult, player int, players int) *tri for _, i := range o.Items { if (i.ID % players) == (player - 1) { - klog.Infof("%d belongs to player %d", i.ID, player) + klog.V(3).Infof("%d belongs to player %d", i.ID, player) cs = append(cs, i) } } diff --git a/site/static/css/tparty.css b/site/static/css/tparty.css index 54a2417..e561d95 100644 --- a/site/static/css/tparty.css +++ b/site/static/css/tparty.css @@ -211,41 +211,36 @@ td:last-child { padding-right: 0.2em !important; } background-color: #E98074; } -.tag-closed { - background-color: #CA2339 !important; -} -.tag-pr-unreviewed { - background-color: #F00 !important; - -} - -.tag-pr-unreviewed { - background-color: #F08 !important; +.tag-pr-unreviewed, .tag-unreviewed { + background-color: #F08 !important; + color: #FFF !important; + font-weight: bold; + font-style: italic; + } .tag-pr-unreviewed a { color: #FFF !important; - font-weight: bold; - font-style: italic; } -.tag-pr-new-commits { +.tag-pr-new-commits,.tag-new-commits { background-color: #F80 !important; + color: #FFF !important; + font-weight: bold; + font-style: italic; } .tag-pr-new-commits a { color: #FFF !important; - font-weight: bold; - font-style: italic; } -.tag-pr-approved { +.tag-pr-approved,.tag-approved { background-color: #00A125 !important; color: #FFF !important; } -.tag-pr-pushed-after-approval { - background-color: #40A125 !important; +.tag-pr-pushed-after-approval,.tag-pushed-after-approval { + background-color: #80A125 !important; color: #FFF !important; } @@ -253,26 +248,26 @@ td:last-child { padding-right: 0.2em !important; } color: #FFF !important; } -.tag-pr-merged { +.tag-pr-merged,.tag-merged { background-color: #6418BD !important; - color: #FFF; + color: #FFF !important; } .tag-pr-merged a { color: #FFF !important; } -.tag-pr-closed { - background-color: #F00 !important; - color: #000; +.tag-pr-closed,.tag-closed { + background-color: #CA2339 !important; + color: #000 !important; text-decoration: line-through; } .tag-pr-closed a { - color: #FFF !important; + color: #000 !important; } -.tag-pr-changes-requested { +.tag-pr-changes-requested, .tag-changes-requested { background-color: #FF0 !important; }