Merge pull request #650 from spastorino/improve-prioritization-mcp-announcements

Improve FCP/MCP listing on prioritization process

src/prioritization.rs

@@ -232,7 +232,46 @@ pub fn agenda<'a>() -> Box<Step<'a>> {
 
     let mut queries = Vec::new();
 
-    // MCP queries
+    // MCP/FCP queries
+    queries.push(QueryMap {
+        name: "mcp_new_not_seconded",
+        query: github::Query {
+            kind: github::QueryKind::List,
+            filters: vec![("state", "open")],
+            include_labels: vec!["major-change", "to-announce"],
+            exclude_labels: vec!["final-comment-period"],
+        },
+    });
+
+    queries.push(QueryMap {
+        name: "mcp_old_not_seconded",
+        query: github::Query {
+            kind: github::QueryKind::List,
+            filters: vec![("state", "open")],
+            include_labels: vec!["major-change"],
+            exclude_labels: vec!["to-announce", "final-comment-period"],
+        },
+    });
+
+    queries.push(QueryMap {
+        name: "in_pre_fcp_compiler_team",
+        query: github::Query {
+            kind: github::QueryKind::List,
+            filters: vec![("state", "open")],
+            include_labels: vec!["proposed-final-comment-period"],
+            exclude_labels: vec![],
+        },
+    });
+    queries.push(QueryMap {
+        name: "in_fcp_compiler_team",
+        query: github::Query {
+            kind: github::QueryKind::List,
+            filters: vec![("state", "open")],
+            include_labels: vec!["final-comment-period"],
+            exclude_labels: vec![],
+        },
+    });
+
     queries.push(QueryMap {
         name: "mcp_accepted",
         query: github::Query {
@@ -243,38 +282,60 @@ pub fn agenda<'a>() -> Box<Step<'a>> {
         },
     });
 
+    actions.push(Query {
+        repo: "rust-lang/compiler-team",
+        queries,
+    });
+
+    let mut queries = Vec::new();
+
     queries.push(QueryMap {
-        name: "mcp_seconded",
+        name: "in_pre_fcp_rust",
         query: github::Query {
             kind: github::QueryKind::List,
             filters: vec![("state", "open")],
-            include_labels: vec!["major-change", "final-comment-period"],
+            include_labels: vec!["proposed-final-comment-period", "T-compiler"],
             exclude_labels: vec![],
         },
     });
-
     queries.push(QueryMap {
-        name: "mcp_new_not_seconded",
+        name: "in_fcp_rust",
         query: github::Query {
             kind: github::QueryKind::List,
             filters: vec![("state", "open")],
-            include_labels: vec!["major-change", "to-announce"],
-            exclude_labels: vec!["final-comment-period"],
+            include_labels: vec!["final-comment-period", "T-compiler"],
+            exclude_labels: vec![],
         },
     });
 
+    actions.push(Query {
+        repo: "rust-lang/rust",
+        queries,
+    });
+
+    let mut queries = Vec::new();
+
     queries.push(QueryMap {
-        name: "mcp_old_not_seconded",
+        name: "in_pre_fcp_forge",
         query: github::Query {
             kind: github::QueryKind::List,
             filters: vec![("state", "open")],
-            include_labels: vec!["major-change"],
-            exclude_labels: vec!["to-announce", "final-comment-period"],
+            include_labels: vec!["proposed-final-comment-period"],
+            exclude_labels: vec![],
+        },
+    });
+    queries.push(QueryMap {
+        name: "in_fcp_forge",
+        query: github::Query {
+            kind: github::QueryKind::List,
+            filters: vec![("state", "open")],
+            include_labels: vec!["final-comment-period"],
+            exclude_labels: vec![],
         },
     });
 
     actions.push(Query {
-        repo: "rust-lang/compiler-team",
+        repo: "rust-lang/rust-forge",
         queries,
     });
 

templates/agenda.tt

@@ -10,15 +10,20 @@ tags: weekly, rustc
 
 ## Announcements
 
-- Major Changes Proposals:
-  - New accepted proposals
-{{-issues::render(issues=mcp_accepted, indent="    ", empty="No new accepted proposals this time.")}}
-  - Seconded proposals (in FCP)
-{{-issues::render(issues=mcp_seconded, indent="    ", empty="No seconded proposals this time.")}}
-  - New proposals (not seconded)
+- New MCPs (take a look, see if you like them!)
 {{-issues::render(issues=mcp_new_not_seconded, indent="    ", empty="No new proposals this time.")}}
-  - Old proposals (not seconded)
+- Old MCPs (not seconded, take a look)
 {{-issues::render(issues=mcp_old_not_seconded, indent="    ", empty="No old proposals this time.")}}
+- Pending FCP requests (check your boxes!)
+{{-issues::render(issues=in_pre_fcp_compiler_team, indent="    ", empty="No pending FCP requests on rust repo this time.")}}
+{{-issues::render(issues=in_pre_fcp_rust, indent="    ", empty="No pending FCP requests on compiler-team repo this time.")}}
+{{-issues::render(issues=in_pre_fcp_forge, indent="    ", empty="No pending FCP requests on forge repo this time.")}}
+- Things in FCP (make sure you're good with it)
+{{-issues::render(issues=in_fcp_compiler_team, indent="    ", empty="No FCP requests on rust repo this time.")}}
+{{-issues::render(issues=in_fcp_rust, indent="    ", empty="No FCP requests on compiler-team repo this time.")}}
+{{-issues::render(issues=in_fcp_forge, indent="    ", empty="No FCP requests on forge repo this time.")}}
+- Accepted MCPs
+{{-issues::render(issues=mcp_accepted, indent="    ", empty="No new accepted proposals this time.")}}
 
 ### WG checkins