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.

Sign up for GitHub

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

Jump to bottom

Changelogs 3.14 #10338

Merged
merged 9 commits into from
Sep 14, 2024
Merged

Changelogs 3.14 #10338

merged 9 commits into from
Sep 14, 2024

Conversation

ffaf1
Copy link
Collaborator

@ffaf1 ffaf1 commented Sep 12, 2024 •
edited
Loading

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).

Changelogs touch up. Note:

I have divided various suggestions in commits. The one which created a discusson were:

  • GHC note
  • removing an entry from cabal-install changelogs

@ffaf1 ffaf1 added the squash+merge me Tell Mergify Bot to squash-merge label Sep 12, 2024
@ffaf1 ffaf1 mentioned this pull request Sep 12, 2024
Open
20 tasks
ulysses4ever
ulysses4ever approved these changes Sep 12, 2024
View reviewed changes
Copy link
Collaborator

@ulysses4ever ulysses4ever left a comment

Choose a reason for hiding this comment

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

Thanks!

Not sure why some entries got reordered, but no harm there I suppose.

@geekosaur
Copy link
Collaborator

Because he requested that some things in the "breaking" section move to "other changes", and vice versa. Look at the original PR.

@geekosaur
Copy link
Collaborator

BTW do we want to leave that label on here? We're tempting Mergify to repeat what it did to the last one.

@ffaf1 ffaf1 force-pushed the changelogs-3.14 branch 2 times, most recently from 13af552 to 6a2781f Compare September 12, 2024 19:36
@ffaf1 ffaf1 removed the squash+merge me Tell Mergify Bot to squash-merge label Sep 12, 2024
@ffaf1
Copy link
Collaborator Author

ffaf1 commented Sep 12, 2024

We should not merge this until #10339 and #10341 (and maybe others? new options?) are merged, so we can do the job in one pass (two passes, since we need to get rid of changelog files on master).

@geekosaur
Copy link
Collaborator

I think not "new options", per the call: those won't be done until the first alpha, but the GHC team wants 3.14 released before they can cut the alpha.

@ulysses4ever
Copy link
Collaborator

I think not "new options", per the call: those won't be done until the first alpha, but the GHC team wants 3.14 released before they can cut the alpha.

I smell 3.16 in the air 🫣

@geekosaur
Copy link
Collaborator

Too soon, we don't have the resources to do two major releases in such short order.

@ulysses4ever
Copy link
Collaborator

well, until we have 3.16 we don't have a cabal-install fully supporting GHC 9.12, right? (due to unsupported language extensions?)

@geekosaur
Copy link
Collaborator

geekosaur commented Sep 13, 2024 •
edited
Loading

The point is that that must be in cabal-install 3.14. That, or we are rushing straight into the 3.16 release the instant we complete the 3.14 release, because it's going to be needed within a month after the 3.14 release. During the call, we concluded that since it's going to be needed so quickly, there's no point in separating it and making two major releases in rapid succession.

@geekosaur
Copy link
Collaborator

geekosaur commented Sep 13, 2024 •
edited
Loading

To try to clarify more (again, is this not in the meeting notes?), Rodrigo told us that the reason they need Cabal 3.14 so soon is that they need it to cut ghc 9.12.1 alpha releases, which is expected to happen within a week of the 9.12 branch. Ideally we already have a matching cabal-install released when they release the first alpha, but we must have it when 9.12.1 is released which should happen shortly thereafter. So we don't have time to cut a 3.16 release, we need to fold it into 3.14.

@ffaf1
Copy link
Collaborator Author

ffaf1 commented Sep 13, 2024

Since we are a bit close to the release deadline, I added the two missing changelog entries (SPDX, extensions) manually so we can wrap this up and forward-port it to master in a timely manner.

@ffaf1 ffaf1 added the squash+merge me Tell Mergify Bot to squash-merge label Sep 13, 2024
ffaf1 added a commit to ffaf1/cabal that referenced this pull request Sep 13, 2024
@ffaf1
Remove changelog entry
0e2ff5d 
We don't need it, changes have been manually
incorporated in 3.14 release notes (haskell#10338)
ffaf1 added a commit to ffaf1/cabal that referenced this pull request Sep 13, 2024
@ffaf1
Remove changelog entry
1976c1e 
We don't need it, changes have been manually
incorporated in 3.14 release notes (haskell#10338)
@ffaf1
Copy link
Collaborator Author

ffaf1 commented Sep 13, 2024

@mergify rebase

@mergify Mergify
Copy link
Contributor

mergify bot commented Sep 13, 2024

rebase

❌ Unable to rebase: user ffaf1 is unknown.

Please make sure ffaf1 has logged in Mergify dashboard.

@ulysses4ever
Copy link
Collaborator

@mergify rebase

@mergify Mergify
Copy link
Contributor

mergify bot commented Sep 13, 2024

rebase

✅ Nothing to do for rebase action

ffaf1 added a commit to ffaf1/cabal that referenced this pull request Sep 14, 2024
@ffaf1
Remove changelog entry
8e34780 
We don't need it, changes have been manually
incorporated in 3.14 release notes (haskell#10338)
@ffaf1
Fix SPDX entry
d6b913b 
We are not doing the sensible thing anymore.
@ffaf1 ffaf1 added squash+merge me Tell Mergify Bot to squash-merge and removed squash+merge me Tell Mergify Bot to squash-merge labels Sep 14, 2024
@mergify mergify bot merged commit 93db940 into haskell:3.14 Sep 14, 2024
52 checks passed
@ffaf1 ffaf1 deleted the changelogs-3.14 branch September 14, 2024 18:07
ffaf1 pushed a commit to ffaf1/cabal that referenced this pull request Sep 14, 2024
@ulysses4ever @ffaf1
Add changelogs for 3.14
f57bd8a 
Forward port of haskell#10336 and haskell#10338
ffaf1 pushed a commit to ffaf1/cabal that referenced this pull request Sep 15, 2024
@ulysses4ever @ffaf1
Add changelogs for 3.14
8d65519 
Forward port of haskell#10336, haskell#10338, and haskell#10358
mergify bot added a commit that referenced this pull request Sep 15, 2024
@ffaf1 @mergify
Add OrPatterns extensions (#10339)
66d401b 
* Add OrPatterns extension

* Add changelog

* Add missing full stop

* Add missing NoMultilineStrings in vim syntax file

* Make test happy

* Remove changelog entry

We don't need it, changes have been manually
incorporated in 3.14 release notes (#10338)

---------

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
mergify bot added a commit that referenced this pull request Sep 16, 2024
@ffaf1 @mergify
Update SPDX license list to version 3.25 (#10341)
55c61aa 
* Handle 3D Slicer licence

* Update SPDX license list to version 3.25

* Remove changelog entry

We don't need it, changes have been manually
incorporated in 3.14 release notes (#10338)

---------

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
mergify bot pushed a commit that referenced this pull request Sep 16, 2024
@ffaf1 @mergify
Update SPDX license list to version 3.25 (#10341)
47ecaab 
* Handle 3D Slicer licence

* Update SPDX license list to version 3.25

* Remove changelog entry

We don't need it, changes have been manually
incorporated in 3.14 release notes (#10338)

---------

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
(cherry picked from commit 55c61aa)
@mergify mergify bot added the merge delay passed Applied (usually by Mergify) when PR approved and received no updates for 2 days label Sep 16, 2024
Mikolaj pushed a commit to ffaf1/cabal that referenced this pull request Sep 16, 2024
@ulysses4ever @Mikolaj
Add changelogs for 3.14
3ee558e 
Forward port of haskell#10336, haskell#10338, and haskell#10358
mergify bot added a commit that referenced this pull request Sep 16, 2024
@mergify
Merge pull request #10357 from ffaf1/changelogs-forward-port
e1b59b4 
Add changelogs for 3.14 (backport #10336 #10338)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ulysses4ever ulysses4ever ulysses4ever approved these changes

@geekosaur geekosaur geekosaur approved these changes

Assignees
No one assigned
Labels
merge delay passed Applied (usually by Mergify) when PR approved and received no updates for 2 days squash+merge me Tell Mergify Bot to squash-merge
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@ffaf1 @geekosaur @ulysses4ever