Skip to content

Commit 138e37c

Browse files
committed
Check for bot accounts earlier in Acknowledgements generation
This allows to handle bots not connected to a GitHub account. Additionally extend the list of considered bot emails and adjust the recommendation in case of missing author metadata.
1 parent c6b293f commit 138e37c

1 file changed

Lines changed: 10 additions & 7 deletions

File tree

.github/workflows/generateAcknowledgements.yml

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -114,14 +114,16 @@ jobs:
114114
continue;
115115
}
116116
let authorName = commitData.commit.author.name
117-
if (commitData.author) {
118-
let profile = commitData.author.login
119-
if (isBot(commitData.commit.author)) { // Exclude contributors from bot-accounts
117+
let profile = commitData.author?.login
118+
if (isBot(commitData.commit.author)) { // Exclude contributions from bot-accounts
119+
if (profile) {
120120
skippedBotAccounts.add(profile)
121-
continue;
122121
}
122+
continue
123+
}
124+
if (profile) {
123125
const committerProfile = commitData.committer?.login
124-
if (commitData.commit.author.name == commitData.commit.committer.name
126+
if (authorName == commitData.commit.committer.name
125127
&& committerProfile && profile != committerProfile) {
126128
// Sometimes contributors use different profiles. Let the committer profile take precedence
127129
profileReplacements.add("@" + profile + " -> @" + committerProfile)
@@ -230,7 +232,8 @@ jobs:
230232
> Authors skipped due to missing author metadata on GitHub:
231233
${Array.from(missingAuthors.keys()).map(a => '> - \`' + a + '\` contributed\n' + Array.from(missingAuthors.get(a)).map(c => '> - ' + c).join('\n') ).join('\n')}
232234
>
233-
> Probably the author's email isn't connected to their GitHub accounts.
235+
> Probably the authors' emails are not connected to their GitHub accounts.
236+
> If possible, ask them to establish that connection and regenerate this acknowledgements.
234237
`
235238
}
236239
if (profileReplacements.size > 0) {
@@ -264,7 +267,7 @@ jobs:
264267
265268
function isBot(author) {
266269
const email = author.email.toLowerCase()
267-
return email.endsWith("-bot@eclipse.org") || email.endsWith("[bot]@users.noreply.github.com")
270+
return email.endsWith('-bot@eclipse.org') || email.endsWith('[bot]@users.noreply.github.com') || email.endsWith('-bot@users.noreply.github.com')
268271
|| email.endsWith('+copilot@users.noreply.github.com')
269272
|| email.endsWith('+claude@users.noreply.github.com')
270273
}

0 commit comments

Comments
 (0)