Skip to content

Commit 807bda0

Browse files
authored
fix: explicitly sort PRs by updated desc (#1685)
Do not rely on the default sort order which can change
1 parent 2b020ae commit 807bda0

2 files changed

Lines changed: 46 additions & 40 deletions

File tree

src/github.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -673,6 +673,8 @@ export class GitHub {
673673
owner: this.repository.owner,
674674
repo: this.repository.repo,
675675
base: targetBranch,
676+
sort: 'updated',
677+
direction: 'desc',
676678
}
677679
)) {
678680
for (const pull of pulls) {

test/github.ts

Lines changed: 44 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -309,49 +309,53 @@ describe('GitHub', () => {
309309
req.done();
310310
});
311311
it('uses REST API if files are not needed', async () => {
312-
req.get('/repos/fake/fake/pulls?base=main&state=closed').reply(200, [
313-
{
314-
head: {
315-
ref: 'feature-branch',
316-
},
317-
base: {
318-
ref: 'main',
319-
},
320-
number: 123,
321-
title: 'some title',
322-
body: 'some body',
323-
labels: [{name: 'label 1'}, {name: 'label 2'}],
324-
merge_commit_sha: 'abc123',
325-
merged_at: '2022-08-08T19:07:20Z',
326-
},
327-
{
328-
head: {
329-
ref: 'feature-branch',
330-
},
331-
base: {
332-
ref: 'main',
312+
req
313+
.get(
314+
'/repos/fake/fake/pulls?base=main&state=closed&sort=updated&direction=desc'
315+
)
316+
.reply(200, [
317+
{
318+
head: {
319+
ref: 'feature-branch',
320+
},
321+
base: {
322+
ref: 'main',
323+
},
324+
number: 123,
325+
title: 'some title',
326+
body: 'some body',
327+
labels: [{name: 'label 1'}, {name: 'label 2'}],
328+
merge_commit_sha: 'abc123',
329+
merged_at: '2022-08-08T19:07:20Z',
333330
},
334-
number: 124,
335-
title: 'merged title 2 ',
336-
body: 'merged body 2',
337-
labels: [{name: 'label 1'}, {name: 'label 2'}],
338-
merge_commit_sha: 'abc123',
339-
merged_at: '2022-08-08T19:07:20Z',
340-
},
341-
{
342-
head: {
343-
ref: 'feature-branch',
331+
{
332+
head: {
333+
ref: 'feature-branch',
334+
},
335+
base: {
336+
ref: 'main',
337+
},
338+
number: 124,
339+
title: 'merged title 2 ',
340+
body: 'merged body 2',
341+
labels: [{name: 'label 1'}, {name: 'label 2'}],
342+
merge_commit_sha: 'abc123',
343+
merged_at: '2022-08-08T19:07:20Z',
344344
},
345-
base: {
346-
ref: 'main',
345+
{
346+
head: {
347+
ref: 'feature-branch',
348+
},
349+
base: {
350+
ref: 'main',
351+
},
352+
number: 125,
353+
title: 'closed title',
354+
body: 'closed body',
355+
labels: [{name: 'label 1'}, {name: 'label 2'}],
356+
merge_commit_sha: 'def234',
347357
},
348-
number: 125,
349-
title: 'closed title',
350-
body: 'closed body',
351-
labels: [{name: 'label 1'}, {name: 'label 2'}],
352-
merge_commit_sha: 'def234',
353-
},
354-
]);
358+
]);
355359
const generator = github.pullRequestIterator('main', 'MERGED', 30, false);
356360
const pullRequests: PullRequest[] = [];
357361
for await (const pullRequest of generator) {

0 commit comments

Comments
 (0)