Skip to content

Commit 67f108c

Browse files
nikomatsakisnikomatsakis
authored
Merge pull request #1366 from nikomatsakis/2021-05-21-lang-agenda
overhaul lang agenda
2 parents 2083b33 + 088a560 commit 67f108c

File tree

5 files changed

+112
-233
lines changed

5 files changed

+112
-233
lines changed

‎lang-agenda.md

Lines changed: 0 additions & 139 deletions
This file was deleted.

‎src/agenda.rs

Lines changed: 88 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -513,90 +513,96 @@ pub fn prioritization<'a>() -> Box<dyn Action> {
513513
}
514514

515515
pub fn lang<'a>() -> Box<dyn Action> {
516-
let mut actions = Vec::new();
517-
518-
let mut queries = Vec::new();
519-
520-
queries.push(QueryMap {
521-
name: "pending_proposals",
522-
query: github::Query {
523-
kind: github::QueryKind::List,
524-
filters: vec![("state", "open"), ("is", "issue")],
525-
include_labels: vec!["major-change"],
526-
exclude_labels: vec!["charter-needed"],
527-
},
528-
});
529-
530-
queries.push(QueryMap {
531-
name: "scheduled_meetings",
532-
query: github::Query {
533-
kind: github::QueryKind::List,
534-
filters: vec![("state", "open"), ("is", "issue")],
535-
include_labels: vec!["meeting-proposal", "meeting-scheduled"],
536-
exclude_labels: vec![],
537-
},
538-
});
539-
540-
actions.push(Query {
541-
repos: vec!["rust-lang/lang-team"],
542-
queries,
543-
});
544-
545-
let mut queries = Vec::new();
546-
547-
// https://github.com/rust-lang/rfcs/pulls?q=is%3Aopen+is%3Apr+label%3AT-lang
548-
queries.push(QueryMap {
549-
name: "newly_created_rfcs",
550-
query: github::Query {
551-
kind: github::QueryKind::List,
552-
filters: vec![("state", "open"), ("is", "pr")],
553-
include_labels: vec!["T-lang"],
554-
exclude_labels: vec![],
555-
},
556-
});
557-
558-
//https://github.com/rust-lang/rfcs/pulls?q=is%3Aopen+is%3Apr+label%3AI-nominated+label%3AT-lang
559-
queries.push(QueryMap {
560-
name: "nominated_rfcs",
561-
query: github::Query {
562-
kind: github::QueryKind::List,
563-
filters: vec![("state", "open"), ("is", "pr")],
564-
include_labels: vec!["T-lang", "I-nominated"],
565-
exclude_labels: vec![],
566-
},
567-
});
568-
569-
actions.push(Query {
570-
repos: vec!["rust-lang/rfcs"],
571-
queries,
572-
});
573-
574-
actions.push(Query {
575-
repos: vec!["rust-lang/rust", "rust-lang/reference"],
576-
queries: vec![
577-
QueryMap {
578-
name: "p_high_issues",
579-
query: github::Query {
580-
kind: github::QueryKind::List,
581-
filters: vec![("state", "open")],
582-
include_labels: vec!["T-lang", "P-high"],
583-
exclude_labels: vec![],
584-
},
516+
Box::new(Step {
517+
name: "lang_agenda",
518+
actions: vec![
519+
Query {
520+
repos: vec!["rust-lang/lang-team"],
521+
queries: vec![
522+
QueryMap {
523+
name: "pending_project_proposals",
524+
query: github::Query {
525+
kind: github::QueryKind::List,
526+
filters: vec![("state", "open"), ("is", "issue")],
527+
include_labels: vec!["major-change"],
528+
exclude_labels: vec!["charter-needed"],
529+
},
530+
},
531+
QueryMap {
532+
name: "pending_lang_team_prs",
533+
query: github::Query {
534+
kind: github::QueryKind::List,
535+
filters: vec![("state", "open"), ("is", "pr")],
536+
include_labels: vec![],
537+
exclude_labels: vec![],
538+
},
539+
},
540+
QueryMap {
541+
name: "scheduled_meetings",
542+
query: github::Query {
543+
kind: github::QueryKind::List,
544+
filters: vec![("state", "open"), ("is", "issue")],
545+
include_labels: vec!["meeting-proposal", "meeting-scheduled"],
546+
exclude_labels: vec![],
547+
},
548+
},
549+
],
585550
},
586-
QueryMap {
587-
name: "nominated_prs_issues",
588-
query: github::Query {
589-
kind: github::QueryKind::List,
590-
filters: vec![("state", "open")],
591-
include_labels: vec!["T-lang", "I-nominated"],
592-
exclude_labels: vec![],
593-
},
551+
Query {
552+
repos: vec![
553+
"rust-lang/rfcs",
554+
"rust-lang/rust",
555+
"rust-lang/reference",
556+
"rust-lang/lang-team",
557+
],
558+
queries: vec![
559+
QueryMap {
560+
name: "p_critical",
561+
query: github::Query {
562+
kind: github::QueryKind::List,
563+
filters: vec![("state", "open")],
564+
include_labels: vec!["T-lang", "P-critical"],
565+
exclude_labels: vec![],
566+
},
567+
},
568+
QueryMap {
569+
name: "nominated",
570+
query: github::Query {
571+
kind: github::QueryKind::List,
572+
filters: vec![("state", "open")],
573+
include_labels: vec!["T-lang", "I-nominated"],
574+
exclude_labels: vec![],
575+
},
576+
},
577+
QueryMap {
578+
name: "proposed_fcp",
579+
query: github::Query {
580+
kind: github::QueryKind::List,
581+
filters: vec![("state", "open")],
582+
include_labels: vec!["T-lang", "proposed-final-comment-period"],
583+
exclude_labels: vec![],
584+
},
585+
},
586+
QueryMap {
587+
name: "in_fcp",
588+
query: github::Query {
589+
kind: github::QueryKind::List,
590+
filters: vec![("state", "open")],
591+
include_labels: vec!["T-lang", "final-comment-period"],
592+
exclude_labels: vec![],
593+
},
594+
},
595+
QueryMap {
596+
name: "finished_fcp",
597+
query: github::Query {
598+
kind: github::QueryKind::List,
599+
filters: vec![("state", "open")],
600+
include_labels: vec!["T-lang", "finished-final-comment-period"],
601+
exclude_labels: vec![],
602+
},
603+
},
604+
],
594605
},
595606
],
596-
});
597-
598-
Box::new(Step {
599-
name: "lang_agenda",
600-
actions,
601607
})
602608
}

‎src/github.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -766,10 +766,10 @@ impl Repository {
766766
.iter()
767767
.any(|&(key, value)| key == "is" && value == "pr");
768768
// negating filters can only be handled by the search api
769-
let url = if use_issues {
770-
self.build_issues_url(filters, include_labels)
771-
} else if is_pr {
769+
let url = if is_pr {
772770
self.build_pulls_url(filters, include_labels)
771+
} else if use_issues {
772+
self.build_issues_url(filters, include_labels)
773773
} else {
774774
self.build_search_issues_url(filters, include_labels, exclude_labels)
775775
};

‎templates/_issues_heading.tt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66

77
**Link:** {{issue.html_url}}
88
{%else%}
9-
{{empty}}
9+
10+
None.
11+
1012
{%endfor%}
1113
{% endmacro %}

‎templates/lang_agenda.tt

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,18 +27,28 @@ tags: triage-meeting
2727

2828
* [Action items list](https://hackmd.io/gstfhtXYTHa3Jv-P_2RK7A)
2929

30-
## Pending proposals
30+
## Pending lang team project proposals
3131

32-
{{-issues_heading::render(issues=pending_proposals, empty="No pending proposals this time.")}}
32+
{{-issues_heading::render(issues=pending_project_proposals)}}
3333

34-
## Nominated RFCs
34+
## PRs on the lang-team repo
3535

36-
{{-issues_heading::render(issues=nominated_rfcs, empty="No nominated RFCs this time.")}}
36+
{{-issues_heading::render(issues=pending_lang_team_prs)}}
3737

38-
## P-high issues on rust-lang/rust
38+
## Proposed FCPs
3939

40-
{{-issues_heading::render(issues=p_high_issues, empty="No P-high issues this time.")}}
40+
**Check your boxes!**
4141

42-
## Nominated PRs and issues
42+
{{-issues_heading::render(issues=proposed_fcp)}}
4343

44-
{{-issues_heading::render(issues=nominated_prs_issues, empty="No nominated items this time.")}}
44+
## Active FCPs
45+
46+
{{-issues_heading::render(issues=in_fcp)}}
47+
48+
## P-critical issues
49+
50+
{{-issues_heading::render(issues=p_critical)}}
51+
52+
## Nominated RFCs, PRs and issues
53+
54+
{{-issues_heading::render(issues=nominated)}}

0 commit comments

Comments
 (0)