Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions site/src/github.rs
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,8 @@ pub async fn unroll_rollup(

// Sort rolled up commits by their PR number in ascending order, so that they have the
Comment thread
JonathanBrouwer marked this conversation as resolved.
Outdated
// same ordering as in the rollup PR description.
let mut unrolled_builds: Vec<UnrolledCommit> =
enqueue_unrolled_try_builds(&gh_client, rollup_merges, previous_master).await?;
// The number should really be an integer, but if not, we will just sort the "non-integer" PRs
// first.
unrolled_builds.sort_by_cached_key(|commit| commit.original_pr_number.parse::<u64>().ok());

let mapping = unrolled_builds
let mapping = enqueue_unrolled_try_builds(&gh_client, rollup_merges, previous_master)
.await?
.into_iter()
.fold(String::new(), |mut string, c| {
use std::fmt::Write;
Expand Down
1 change: 0 additions & 1 deletion site/src/request_handlers/github.rs
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ async fn handle_push(ctxt: Arc<SiteCtxt>, push: github::Push) -> ServerResult<gi
tokio::spawn(async move {
let rollup_merges = commits
.iter()
.rev()
.filter(|c| c.message.starts_with("Rollup merge of #"));
let result =
unroll_rollup(gh_client, rollup_merges, &previous_master, rollup_pr_number).await;
Expand Down
Loading