Skip to content

Backport #10894: Add release notes for 3.14.2.0 release #10905

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

Merged
merged 7 commits into from
Apr 4, 2025

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 3, 2025

Add release notes for the 3.14.2.0 release


This is an automatic backport of pull request #10894 done by Mergify.

@mergify mergify bot added the conflicts label Apr 3, 2025
Copy link
Contributor Author

mergify bot commented Apr 3, 2025

Cherry-pick of 7bd6198 has failed:

On branch mergify/bp/master/pr-10894
Your branch is up to date with 'origin/master'.

You are currently cherry-picking commit 7bd6198c0.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   Cabal-syntax/ChangeLog.md
	modified:   Cabal/ChangeLog.md
	modified:   cabal-install-solver/ChangeLog.md
	deleted:    changelog.d/pr-10554
	deleted:    changelog.d/pr-10616
	deleted:    changelog.d/pr-10725
	deleted:    changelog.d/pr-10728
	deleted:    changelog.d/pr-10730
	deleted:    changelog.d/pr-10731
	deleted:    changelog.d/pr-10783
	deleted:    changelog.d/pr-10800
	deleted:    changelog.d/pr-10826
	deleted:    changelog.d/pr-10827.md
	deleted:    changelog.d/pr-10841.md
	deleted:    changelog.d/pr-9997
	new file:   release-notes/Cabal-3.14.2.0.md
	new file:   release-notes/cabal-install-3.14.2.0.md

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   Cabal-hooks/CHANGELOG.md
	deleted by us:   cabal-install/changelog
	deleted by them: changelog.d/pr-10493
	deleted by them: changelog.d/pr-10546
	deleted by them: changelog.d/pr-10828.md

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@Mikolaj
Copy link
Member

Mikolaj commented Apr 3, 2025

There is something wrong with these conflicts, but they have to be fixed and the PR merged. Let's investigate!

@Mikolaj Mikolaj added the attention: needs-help Help wanted with this issue/PR label Apr 3, 2025
@geekosaur
Copy link
Collaborator

geekosaur commented Apr 3, 2025

I think the changelogs are due to #10849 not being backported? —ETA: if so, the changes will have to be determined manually and reformatted as markdown.

@Mikolaj
Copy link
Member

Mikolaj commented Apr 4, 2025

I guess, the changes to put in the changelog are already determined, so maybe the easiest way is to manually hack a passable .md formatting for the text that is already there?

@ulysses4ever
Copy link
Collaborator

#10849 only touched the changelog and the cabal files. THe conflicts are all over the little changelog files. So I can't see how #10849 can be involved here.

@ulysses4ever
Copy link
Collaborator

Well, I guess, the cabal-install/changelog is on the list:

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   Cabal-hooks/CHANGELOG.md
	deleted by us:   cabal-install/changelog
	deleted by them: changelog.d/pr-10493
	deleted by them: changelog.d/pr-10546
	deleted by them: changelog.d/pr-10828.md

@ulysses4ever
Copy link
Collaborator

@Mikolaj I pushed some obvious fixes around the main changelog files. I'm currently looking into the little changelog files.

@ulysses4ever
Copy link
Collaborator

Okay, I pushed what looked like a plausible set of removals for the little changelog files (see the last commit). It'd be great if people could do some sanity checking around it.

@ulysses4ever ulysses4ever added attention: needs-review and removed attention: needs-help Help wanted with this issue/PR conflicts labels Apr 4, 2025
@Mikolaj
Copy link
Member

Mikolaj commented Apr 4, 2025

The list of removed changelog files agrees except for changelog.d/solver-api-change-fixup-3.14 that is not removed in the backport. Also, the extra entry that should not go into https://github.com/haskell/cabal/blob/master/cabal-install/ChangeLog.md got lost.

@ulysses4ever
Copy link
Collaborator

changelog.d/solver-api-change-fixup-3.14 that is not removed in the backport.

it's not on master, so it can't be removed from there, right?

Also, the extra entry that should not go into https://github.com/haskell/cabal/blob/master/cabal-install/ChangeLog.md got lost.

Sorry, can you provide some line that I can grep for? I have no idea what the entry is...

@ulysses4ever
Copy link
Collaborator

oh, scratch that, I got what line you're talking about

@ulysses4ever
Copy link
Collaborator

@Mikolaj how about now?

@ulysses4ever ulysses4ever requested review from ffaf1 and Mikolaj April 4, 2025 15:59
@ulysses4ever ulysses4ever added the squash+merge me Tell Mergify Bot to squash-merge label Apr 4, 2025
Copy link
Collaborator

@geekosaur geekosaur left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Otherwise looks okay on an admittedly quick pass.

@geekosaur geekosaur dismissed their stale review April 4, 2025 16:33

too late for that

Copy link
Member

@Mikolaj Mikolaj left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you this looks fine. Indeed the 3.14.2 entry for hooks is mildly misleading, but it's also mildly clarifying, so I propose to let it be.

@Mikolaj
Copy link
Member

Mikolaj commented Apr 4, 2025

@mergify rebase

(cherry picked from commit 7bd6198)

# Conflicts:
#	Cabal-hooks/CHANGELOG.md
#	cabal-install/changelog
#	changelog.d/pr-10493
#	changelog.d/pr-10546
#	changelog.d/pr-10828.md
Copy link
Contributor Author

mergify bot commented Apr 4, 2025

rebase

✅ Branch has been successfully rebased

@Mikolaj Mikolaj force-pushed the mergify/bp/master/pr-10894 branch from f6c7e14 to 0d21e2a Compare April 4, 2025 16:58
@Mikolaj
Copy link
Member

Mikolaj commented Apr 4, 2025

Windows validate errored out with "failed to download https://www.stackage.org/lts-21.25/cabal.config : HTTP code 525" . Restarting.

@mergify mergify bot added the ready and waiting Mergify is waiting out the cooldown period label Apr 4, 2025
@Mikolaj Mikolaj added the merge delay passed Applied (usually by Mergify) when PR approved and received no updates for 2 days label Apr 4, 2025
@mergify mergify bot merged commit b0f3879 into master Apr 4, 2025
56 checks passed
@mergify mergify bot deleted the mergify/bp/master/pr-10894 branch April 4, 2025 19:38
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 ready and waiting Mergify is waiting out the cooldown period squash+merge me Tell Mergify Bot to squash-merge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants