Skip to content

fix: ignore merge commits for file diffs #859

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

Open
wants to merge 3 commits into
base: main-enterprise
Choose a base branch
from
+19 −5
Open

fix: ignore merge commits for file diffs #859

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
35772ba
fix: guard against result.action being undefined
marionebl Jul 3, 2025
9a5ee8b
fix: ignore merge commits for file diffs
marionebl Jul 7, 2025
e4bad6d
Merge branch 'main-enterprise' into patch-4
marionebl Jul 14, 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
20 changes: 17 additions & 3 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -578,9 +578,23 @@ module.exports = (robot, { getRouter }, Settings = require('./lib/settings')) =>
if (check_suite.before === '0000000000000000000000000000000000000000') {
check_suite.before = check_suite.pull_requests[0].base.sha
}
params = Object.assign(context.repo(), { basehead: `${check_suite.before}...${check_suite.after}` })
const changes = await context.octokit.repos.compareCommitsWithBasehead(params)
const files = changes.data.files.map(f => { return f.filename })
params = Object.assign(context.repo(), { pull_number: pull_request.number, per_page: 100 })

const files = await context.octokit.paginate(context.octokit.pulls.listFiles, params, (response) => {
const files = new Set()

for (const file of response.data) {
files.add(file.filename)

if (file.previous_filename) {
files.add(file.previous_filename)
}
}

return Array.from(files)
})

robot.log.debug('Files changed', { files })

const settingsModified = files.includes(Settings.FILE_PATH)

Expand Down
4 changes: 2 additions & 2 deletions lib/settings.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,8 +245,8 @@ ${this.results.reduce((x, y) => {
if (y.type === 'ERROR') {
error = true
return `${x}
<tr><td> ❗ ${y.action.msg} </td><td> ${y.plugin} </td><td> ${prettify(y.repo)} </td><td> ${prettify(y.action.additions)} </td><td> ${prettify(y.action.deletions)} </td><td> ${prettify(y.action.modifications)} </td><tr>`
} else if (y.action.additions === null && y.action.deletions === null && y.action.modifications === null) {
<tr><td> ❗ ${y.action?.msg} </td><td> ${y.plugin} </td><td> ${prettify(y.repo)} </td><td> ${prettify(y.action?.additions)} </td><td> ${prettify(y.action?.deletions)} </td><td> ${prettify(y.action?.modifications)} </td><tr>`
} else if (y.action?.additions === null && y.action?.deletions === null && y.action?.modifications === null) {
return `${x}`
} else {
if (y.action === undefined) {
Expand Down