File tree Expand file tree Collapse file tree 1 file changed +10
-2
lines changed Expand file tree Collapse file tree 1 file changed +10
-2
lines changed Original file line number Diff line number Diff line change @@ -33,8 +33,16 @@ pub async fn unroll_rollup(
33
33
let display = truncate. then ( || s. split_at ( 10 ) . 0 ) . unwrap_or ( s) ;
34
34
format ! ( "[{display}](https://github.com/rust-lang-ci/rust/commit/{s})" )
35
35
} ;
36
- let mapping = enqueue_unrolled_try_builds ( ci_client, rollup_merges, previous_master)
37
- . await ?
36
+
37
+ // Sort rolled up commits by their PR number in ascending order, so that they have the
38
+ // same ordering as in the rollup PR description.
39
+ let mut unrolled_builds: Vec < UnrolledCommit > =
40
+ enqueue_unrolled_try_builds ( ci_client, rollup_merges, previous_master) . await ?;
41
+ // The number should really be an integer, but if not, we will just sort the "non-integer" PRs
42
+ // first.
43
+ unrolled_builds. sort_by_cached_key ( |commit| commit. original_pr_number . parse :: < u64 > ( ) . ok ( ) ) ;
44
+
45
+ let mapping = unrolled_builds
38
46
. into_iter ( )
39
47
. fold ( String :: new ( ) , |mut string, c| {
40
48
use std:: fmt:: Write ;
You can’t perform that action at this time.
0 commit comments