Skip to content

Commit 6c9ef5e

Browse files
Merge pull request #2502 from jBouyoud/gh-deprecation
fix: handle Github API deprecations
2 parents f455ccd + 35d5824 commit 6c9ef5e

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

packages/core/src/__tests__/git.test.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -378,12 +378,13 @@ describe("github", () => {
378378

379379
issuesAndPullRequests.mockReturnValueOnce({ data: true });
380380
await gh.searchRepo({
381-
q: "is:pr is:open",
381+
q: "is:pr AND is:open",
382382
order: "desc",
383383
});
384384

385385
expect(issuesAndPullRequests).toHaveBeenCalledWith({
386-
q: "repo:Adam Dierkens/test is:pr is:open",
386+
advanced_search: true,
387+
q: "repo:Adam Dierkens/test AND (is:pr AND is:open)",
387388
order: "desc",
388389
});
389390
});

packages/core/src/git.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -518,7 +518,8 @@ export default class Git {
518518
options: RestEndpointMethodTypes["search"]["issuesAndPullRequests"]["parameters"]
519519
) {
520520
const repo = `repo:${this.options.owner}/${this.options.repo}`;
521-
options.q = `${repo} ${options.q}`;
521+
options.q = `${repo} AND (${options.q})`;
522+
options.advanced_search = true;
522523

523524
this.logger.verbose.info("Searching repo using:\n", options);
524525

packages/core/src/release.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -471,7 +471,7 @@ export default class Release {
471471
}
472472

473473
const prsSinceLastRelease = await this.git.searchRepo({
474-
q: `is:pr is:merged merged:>=${lastRelease.published_at}`,
474+
q: `is:pr AND is:merged AND merged:>=${lastRelease.published_at}`,
475475
});
476476

477477
if (!prsSinceLastRelease || !prsSinceLastRelease.items) {

0 commit comments

Comments
 (0)