Skip to content

fix(filter-paths): support merge queue refs #689

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
danadajian merged 2 commits into from
Jan 13, 2025
Merged

fix(filter-paths): support merge queue refs #689

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ab45e3f
fix(filter-paths): support merge queue refs
danadajian Jan 13, 2025
ff7ee6b
Merge branch 'main' into fix-filter-paths
danadajian Jan 13, 2025
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
17 changes: 11 additions & 6 deletions dist/654.index.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/654.index.js.map
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 16 additions & 8 deletions src/helpers/filter-paths.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,22 @@ export class FilterPaths extends HelperInputs {
}

export const filterPaths = async ({ paths, globs, sha }: FilterPaths) => {
const prNumberFromSha = sha
? (
await octokit.repos.listPullRequestsAssociatedWithCommit({
commit_sha: sha,
...context.repo
})
).data.find(Boolean)?.number
: undefined;
const prNumberFromSha =
context.eventName === 'merge_group'
? Number(
context.ref
.split('/')
.find(part => part.includes('pr-'))
?.match(/\d+/)?.[0]
)
: sha
? (
await octokit.repos.listPullRequestsAssociatedWithCommit({
commit_sha: sha,
...context.repo
})
).data.find(Boolean)?.number
: undefined;
const pull_number = prNumberFromSha ?? context.issue.number;

const { data } = await octokit.pulls.listFiles({
Expand Down
14 changes: 14 additions & 0 deletions test/helpers/filter-paths.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,4 +208,18 @@ describe('filterPaths', () => {

expect(octokit.repos.listPullRequestsAssociatedWithCommit).not.toHaveBeenCalled();
});

it('should not call listPullRequestsAssociatedWithCommit if sha is omitted', async () => {
context.eventName = 'merge_group';
context.ref = 'refs/heads/gh-readonly-queue/branch-name/pr-12345-f0d9a4cb862b13cdaab6522f72d6dc17e4336b7f';
await filterPaths({
paths
});

expect(octokit.pulls.listFiles).toHaveBeenCalledWith({
per_page: 100,
pull_number: 12345,
...context.repo
});
});
});
Loading