Skip to content
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.

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

one last changelog entry #10134

Merged
merged 1 commit into from
Jun 21, 2024
Merged

one last changelog entry #10134

merged 1 commit into from
Jun 21, 2024

Conversation

geekosaur
Copy link
Collaborator

This was on master but missing from 3.12.

This was on `master` but missing from 3.12.
@ulysses4ever ulysses4ever added squash+merge me Tell Mergify Bot to squash-merge and removed attention: needs-review labels Jun 21, 2024
@ulysses4ever
Copy link
Collaborator

I wonder why the bot doesn't act on this one

@geekosaur
Copy link
Collaborator Author

It hasn't acted on the original changelog PR either.

I just checked the Mergify rules, and I'm not sure it ever runs on these. There are commit rules for master and there are commit rules for not-master when the body contains "backport".

@geekosaur
Copy link
Collaborator Author

Ugh, and the Mergify rules on 3.12 branch don't support squash+merge me. Did we not backport that?

@geekosaur
Copy link
Collaborator Author

geekosaur commented Jun 21, 2024

We didn't. It had the "backport to 3.12" label, which @Mikolaj removed shortly after it was committed.

@ulysses4ever
Copy link
Collaborator

Great investigation, thanks! Do you think we should merge manually? That would be fine I think. Would be great to extend Mergify config one day...

@geekosaur
Copy link
Collaborator Author

A quick look at past changelogs shows they were updated on master and backported. I guess we need to merge these by hand.

But this is making me wonder how many other things that should have been backported weren't.

@geekosaur
Copy link
Collaborator Author

I'll work on Mergify config after the release. For now, I'm merging manually.

@geekosaur geekosaur merged commit ece010d into 3.12 Jun 21, 2024
52 checks passed
@geekosaur geekosaur deleted the one-last-3.12.1.0-changelog branch June 21, 2024 22:06
@Mikolaj
Copy link
Member

Mikolaj commented Jun 22, 2024

Note: this is in relation to #10132 (comment).

We didn't. It had the "backport to 3.12" label, which @Mikolaj removed shortly after it was committed.

Uhoh. Which PR was that? Let me at least try to find any other backport labels I removed that day.

@geekosaur
Copy link
Collaborator Author

#9879
As it turns out, it doesn't matter for that PR because Mergify only pays attention to .github/mergify.yml in master. I'm still worried about what other PRs we might be missing, though.

@Mikolaj
Copy link
Member

Mikolaj commented Jun 22, 2024

Thanks. I will have a closer look at my routine from that time, later on.

@mergify mergify bot added the merge delay passed Applied (usually by Mergify) when PR approved and received no updates for 2 days label Jun 23, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merge delay passed Applied (usually by Mergify) when PR approved and received no updates for 2 days release squash+merge me Tell Mergify Bot to squash-merge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants