Non-main changes are sent to llvm-commits

[nikic]

It looks like changes to spr-managed branches currently send emails to llvm-commits, which they probably shouldn't. An example is https://lists.llvm.org/pipermail/llvm-commits/Week-of-Mon-20231030/1235264.html.

@joker-eph fyi

[llvmbot]

@llvm/issue-subscribers-infrastructure

Author: Nikita Popov (nikic)

It looks like changes to spr-managed branches currently send emails to llvm-commits, which they probably shouldn't. An example is https://lists.llvm.org/pipermail/llvm-commits/Week-of-Mon-20231030/1235264.html.

@joker-eph fyi

[joker-eph]

I noticed when the email was sent and forwarded to @tstellar and Anton, I don't know where is the code that handle the mailing-list?

[nikic]

The code is in https://github.com/llvm/llvm-admin/blob/main/AWS/Lambda/PREmailer/pr_emailer.py.

[joker-eph]

Thanks! That seems like the right repo, but I suspect the code the commit mailing list is https://github.com/llvm/llvm-admin/blob/main/AWS/Lambda/CommitEmailer/commit_emailer.py#L131C19-L131C19 instead?

[joker-eph]

There is a branch detection here: https://github.com/llvm/llvm-admin/blob/main/AWS/Lambda/CommitEmailer/commit_emailer.py#L178-L179

But it is confusing to me because 1) it should match anything that isn't "master" and so all the commits to "main" should be filtered and 2) it should have fired on my PR...

[tstellar]

I discovered that the code in the repo does not match what is deployed, so I've update the repo now. I'm still not sure why it is failing though. I need a more recent commit to look at, because the webhook log only goes back so far.

[nikic]

It looks like this problem still exists, I keep getting "[𝘀𝗽𝗿] changes introduced through rebase" mails from @jroelofs.

[jroelofs]

oh, hey, @AaronBallman was just asking me about those...

[jroelofs]

@tstellar here's one: https://lists.llvm.org/pipermail/cfe-commits/Week-of-Mon-20231127/522266.html

[jroelofs]

There is a branch detection here: https://github.com/llvm/llvm-admin/blob/main/AWS/Lambda/CommitEmailer/commit_emailer.py#L178-L179

But it is confusing to me because 1) it should match anything that isn't "master" and so all the commits to "main" should be filtered and 2) it should have fired on my PR...

The before/after here make sense in a world where there are only master, main, and release branches:

llvm/llvm-admin@a3b0398

Now that we have personal branches, maybe it ought to be something like (untested):

exclude_branches = ['users']
if any(x in event['ref'] for x in exclude_branches):
    break

[joker-eph]

I don't quite get it? The code is:

            exclude_branches = ['main', 'master']
            if not any(x in event['ref'] for x in exclude_branches):
                mail_to = LLVM_BRANCH_COMMITS_ADDRESS

My read is that is the branch is not main or master, the email address is switched to LLVM_BRANCH_COMMITS_ADDRESS = "llvm-branch-commits@lists.llvm.org" : so why are these commit sent to the other mailing list right now?

[nikic]

I think this is because main is contained in the branch name, e.g. users/bogner/spr/main.hlsl-add-helpers-to-simplify-hlsl-resource-type-declarations-nfc. We should be doing an exact match, not an in.

[jroelofs]

I'm not sure how to test that ^