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

Changelogs for 3.12.1.0 (backport #10124) #10132

Merged
merged 3 commits into from
Jun 25, 2024
Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 21, 2024

Template B: This PR does not modify behaviour or interface

E.g. the PR only touches documentation or tests, does refactorings, etc.

Include the following checklist in your PR:

  • Patches conform to the coding conventions.
  • Is this a PR that fixes CI? If so, it will need to be backported to older cabal release branches (ask maintainers for directions).

Closes #10086


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

* changelog for 3.12.1.0

* fixup! changelog for 3.12.1.0

* fixup! Changelogs for 3.12.1.0

Co-authored-by: Artem Pelenitsyn <a.pelenitsyn@gmail.com>

* fixup! changelog for 3.12.1.0

* fixup! changelog for 3.12.1.0

* fixup! Changelogs for 3.12.1.0

Co-authored-by: ffaf1 <fa-ml@ariis.it>

* fixup! Changelogs for 3.12.1.0

* fixup! Changelogs for 3.12.1.0

* fixup! Changelogs for 3.12.1.0

---------

Co-authored-by: Artem Pelenitsyn <a.pelenitsyn@gmail.com>
Co-authored-by: ffaf1 <fa-ml@ariis.it>
(cherry picked from commit 2067ed1)

# Conflicts:
#	release-notes/Cabal-3.12.0.0.md
Copy link
Contributor Author

mergify bot commented Jun 21, 2024

Cherry-pick of 2067ed1 has failed:

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

You are currently cherry-picking commit 2067ed198.
  (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:
	deleted:    changelog.d/issue-10042
	deleted:    changelog.d/issue-10063
	deleted:    changelog.d/issue-6750
	deleted:    changelog.d/issue-8875
	deleted:    changelog.d/issue-9641
	deleted:    changelog.d/issue-9919
	deleted:    changelog.d/issue-9971
	deleted:    changelog.d/pr-10014
	deleted:    changelog.d/pr-9766
	deleted:    changelog.d/pr-9824
	deleted:    changelog.d/pr-9878
	deleted:    changelog.d/pr-9950
	new file:   release-notes/Cabal-3.12.1.0.md
	renamed:    release-notes/WIP-cabal-install-3.12.x.0.md -> release-notes/cabal-install-3.12.1.0.md

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   release-notes/Cabal-3.12.0.0.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

@mergify mergify bot added the conflicts label Jun 21, 2024
@mergify mergify bot mentioned this pull request Jun 21, 2024
2 tasks
@mergify mergify bot added the backport label Jun 21, 2024
@geekosaur
Copy link
Collaborator

I should probably mention this: worrisomely, master had an entry in Cabal-3.12.0.0.md that wasn't on 3.12 branch.

- Cabal and Cabal-syntax 3.12 support GHC version 8.4.4 and up.

  Support for all previous GHC versions is deprecated.

I merged it into this one, but suspect we need to apply it to 3.12 branch as well.

@ulysses4ever
Copy link
Collaborator

@geekosaur we reference changelogs on master, so it's not too bad, perhaps. E.g. https://hackage.haskell.org/package/Cabal-3.12.0.0/changelog

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.

LGTM. I will expedite unless anybody objects, since this is blocking the 3.12.1.0 release.

@Mikolaj Mikolaj added the squash+merge me Tell Mergify Bot to squash-merge label Jun 25, 2024
@Mikolaj
Copy link
Member

Mikolaj commented Jun 25, 2024

BTW, the "Cabal and Cabal-syntax 3.12 support GHC version 8.4.4 and up" addition was done as an afterthought in a separate PR on master, because changelogs are used on master, and apparently we forgot to backported this PR or it's languishing unmerged somewhere. No big deal, except that it's unnecessary noise.

@Mikolaj Mikolaj added the merge delay passed Applied (usually by Mergify) when PR approved and received no updates for 2 days label Jun 25, 2024
@mergify mergify bot merged commit ffcadaa into master Jun 25, 2024
54 checks passed
@mergify mergify bot deleted the mergify/bp/master/pr-10124 branch June 25, 2024 10:28
jasagredo pushed a commit to jasagredo/cabal that referenced this pull request Jun 26, 2024
* Changelogs for 3.12.1.0 (haskell#10124)

* changelog for 3.12.1.0

* fixup! changelog for 3.12.1.0

* fixup! Changelogs for 3.12.1.0

Co-authored-by: Artem Pelenitsyn <a.pelenitsyn@gmail.com>

* fixup! changelog for 3.12.1.0

* fixup! changelog for 3.12.1.0

* fixup! Changelogs for 3.12.1.0

Co-authored-by: ffaf1 <fa-ml@ariis.it>

* fixup! Changelogs for 3.12.1.0

* fixup! Changelogs for 3.12.1.0

* fixup! Changelogs for 3.12.1.0

---------

Co-authored-by: Artem Pelenitsyn <a.pelenitsyn@gmail.com>
Co-authored-by: ffaf1 <fa-ml@ariis.it>
(cherry picked from commit 2067ed1)

# Conflicts:
#	release-notes/Cabal-3.12.0.0.md

* fixup! Changelogs for 3.12.1.0 (backport haskell#10124)

---------

Co-authored-by: brandon s allbery kf8nh <allbery.b@gmail.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
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.

Changelog for Cabal 3.12 is missing mention of error codes
3 participants