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

missed the two changelog pointers (backport #10138) #10139

Merged
merged 4 commits into from
Jul 6, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 23, 2024

Our release checklist is missing these files.


This is an automatic backport of pull request #10138 done by [Mergify](https://mergify.com).

* missed the two changelog pointers

* Apply suggestions from code review

fixup! missed the two changelog pointers

Co-authored-by: ffaf1 <[email protected]>

* squash! and the other two changelogs

---------

Co-authored-by: ffaf1 <[email protected]>
(cherry picked from commit 82cad89)
@Mikolaj
Copy link
Member

Mikolaj commented Jul 2, 2024

Shall we merge it? What's the new conflict?

@geekosaur
Copy link
Collaborator

The conflict was because of the glitch in 3.10.2.0's changelog entry (it got duplicated during 3.10.3.0 release).

@geekosaur geekosaur added squash+merge me Tell Mergify Bot to squash-merge and removed attention: needs-review labels Jul 2, 2024
@Mikolaj
Copy link
Member

Mikolaj commented Jul 3, 2024

There's a problem in CI that didn't go away after restarting. Looks like a testsuite on branch master has bounds not updated in sync with the version bump to 3.13?

@geekosaur
Copy link
Collaborator

It's a little complicated. Originally I updated that bound, but it caused build failures (essentially this same failure) so I had to back it out. I think that now, post-release, it has to be added again.

@ulysses4ever
Copy link
Collaborator

My recollection is that this issue raises exactly when a release hits Hackage, so it's close to impossible to avoid it: if you bump the bound earlier, it will start failing, as Brandon suggests.

I thought that we pin the index-state these days though. So maybe I'm wrong?..

@ulysses4ever
Copy link
Collaborator

Anyway, the obvious fix seems to work for Validate but fails doctests and some quick jobs, see #10172

@mergify mergify bot added the merge delay passed Applied (usually by Mergify) when PR approved and received no updates for 2 days label Jul 6, 2024
@mergify mergify bot merged commit 2a09ec0 into master Jul 6, 2024
53 checks passed
@mergify mergify bot deleted the mergify/bp/master/pr-10138 branch July 6, 2024 17:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 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.

3 participants