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

Add release notes for Cabal 3.12 #9920

Merged
merged 4 commits into from
Apr 25, 2024
Merged

Conversation

ffaf1
Copy link
Collaborator

@ffaf1 ffaf1 commented Apr 23, 2024

Forwardport of #9785, #9908

Add changelog/release notes for Cabal 3.12 (#9785)

  • generated with git log --pretty=oneline --no-color cabal-install-v3.10.1.0..HEAD > 3.12.prlog
  • deduped
  • stored WIP “release notes” file for future cabal-install release

3.12 changelogs updated (#9908)

  • Update changelog for 3.12

(and for future WIP 3.12.1.0 cabal-install)

  • Remove changelog.d files

Include the following checklist in your PR:

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

See #9909 for failed automatic backport.

release-notes/Cabal-3.12.0.0.md Outdated Show resolved Hide resolved
release-notes/Cabal-3.12.0.0.md Outdated Show resolved Hide resolved
release-notes/Cabal-3.12.0.0.md Show resolved Hide resolved
release-notes/Cabal-3.12.0.0.md Outdated Show resolved Hide resolved
release-notes/Cabal-3.12.0.0.md Show resolved Hide resolved
release-notes/Cabal-3.12.0.0.md Outdated Show resolved Hide resolved
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.

The various minor editing TODOs apart, the structure looks fine and the cabal-install release notes will be useful for @ulysses4ever for 3.12.1.0 and if we make a pre-release of cabal-install from 3.12.0.0, these can be the pre-release notes.

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.

LGTM modulo some Markdown fixes and Brandon's comments (which should be addressed).

ffaf1 added a commit to ffaf1/cabal that referenced this pull request Apr 23, 2024
ffaf1 added a commit to ffaf1/cabal that referenced this pull request Apr 23, 2024
@ffaf1
Copy link
Collaborator Author

ffaf1 commented Apr 23, 2024

Thanks for your suggestions, they will be merged with #9922 and then rebased here.

mergify bot pushed a commit that referenced this pull request Apr 23, 2024
* Incorporate Brandon’s suggestions

See #9920.

* Incorporate Artem’s suggestions

See #9920.

* Do not repeat yourself
ffaf1 added a commit to ffaf1/cabal that referenced this pull request Apr 23, 2024
* Incorporate Brandon’s suggestions

See haskell#9920.

* Incorporate Artem’s suggestions

See haskell#9920.

* Do not repeat yourself
@ffaf1 ffaf1 requested a review from geekosaur April 23, 2024 21:10
@Mikolaj
Copy link
Member

Mikolaj commented Apr 23, 2024

@geekosaur: are you satisfied with the changes? github still shows your comments as blocking.

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.

Minor nits, can be ignored.

release-notes/Cabal-3.12.0.0.md Outdated Show resolved Hide resolved
release-notes/Cabal-3.12.0.0.md Outdated Show resolved Hide resolved
release-notes/Cabal-3.12.0.0.md Outdated Show resolved Hide resolved
ffaf1 added a commit to ffaf1/cabal that referenced this pull request Apr 23, 2024
@ffaf1 ffaf1 mentioned this pull request Apr 23, 2024
2 tasks
ffaf1 added a commit to ffaf1/cabal that referenced this pull request Apr 23, 2024
@ffaf1 ffaf1 added the squash+merge me Tell Mergify Bot to squash-merge label Apr 23, 2024
mergify bot pushed a commit that referenced this pull request Apr 23, 2024
* Fix release notes grammar

See #9920.

* Fix whitespace
@Mikolaj
Copy link
Member

Mikolaj commented Apr 25, 2024

I think we should fast-track this to land before Hackage packages are published (since they link here).

@Mikolaj
Copy link
Member

Mikolaj commented Apr 25, 2024

@mergify rebase

@Mikolaj
Copy link
Member

Mikolaj commented Apr 25, 2024

CI is green, expediting...

Forwardport of haskell#9785, haskell#9908

Add changelog/release notes for Cabal 3.12 (haskell#9785)

- generated with
     git log --pretty=oneline --no-color cabal-install-v3.10.1.0..HEAD > 3.12.prlog
- deduped
- stored WIP “release notes” file for future `cabal-install` release

3.12 changelogs updated (haskell#9908)

* Update changelog for 3.12

(and for future WIP 3.12.1.0 cabal-install)

* Remove changelog.d files
* Incorporate Brandon’s suggestions

See haskell#9920.

* Incorporate Artem’s suggestions

See haskell#9920.

* Do not repeat yourself
Copy link
Contributor

mergify bot commented Apr 25, 2024

rebase

✅ Branch has been successfully rebased

@Mikolaj Mikolaj added the merge delay passed Applied (usually by Mergify) when PR approved and received no updates for 2 days label Apr 25, 2024
@mergify mergify bot merged commit f27cd58 into haskell:master Apr 25, 2024
50 checks passed
geekosaur pushed a commit that referenced this pull request Apr 29, 2024
* Incorporate Brandon’s suggestions

See #9920.

* Incorporate Artem’s suggestions

See #9920.

* Do not repeat yourself
geekosaur pushed a commit that referenced this pull request Apr 29, 2024
* Fix release notes grammar

See #9920.

* Fix whitespace
fendor pushed a commit to fendor/cabal that referenced this pull request Apr 30, 2024
* Add release notes for Cabal 3.12

Forwardport of haskell#9785, haskell#9908

Add changelog/release notes for Cabal 3.12 (haskell#9785)

- generated with
     git log --pretty=oneline --no-color cabal-install-v3.10.1.0..HEAD > 3.12.prlog
- deduped
- stored WIP “release notes” file for future `cabal-install` release

3.12 changelogs updated (haskell#9908)

* Update changelog for 3.12

(and for future WIP 3.12.1.0 cabal-install)

* Remove changelog.d files

* 3.12 changelog fixup (haskell#9922)

* Incorporate Brandon’s suggestions

See haskell#9920.

* Incorporate Artem’s suggestions

See haskell#9920.

* Do not repeat yourself

* Fix whitespace

* Fix release notes grammar

See haskell#9920.
Mikolaj added a commit that referenced this pull request May 1, 2024
3.12 changelog fixup (#9922)

* Incorporate Brandon’s suggestions

See #9920.

* Incorporate Artem’s suggestions

See #9920.

* Do not repeat yourself

* Fix release notes grammar (#9924)

* Fix release notes grammar

See #9920.

* Fix whitespace

* Support GHC 9.12

(cherry picked from commit da6bdef)

* Fix changelog/readme (backport #9935) (#9936)

* Fix changelog/readme

(cherry picked from commit ea0f464)

* Remove previous release date

---------

Co-authored-by: Francesco Ariis <[email protected]>

* Tell zlib not to use pkg-config in GitLab CI.

(cherry picked from commit 62c74fe)

* Revert "Mark ForeignLibs test as broken with ghc-8.4.4"

This reverts commit a90d44f.

(cherry picked from commit d0a690b)

* CI: drop validation of GHC 7

Changes:
- bump GHC_FOR_RELEASE to 9.4.8
- bump action versions
- uniform quoting style
- satisfy actionlint
- fix order: setup Haskell before cache restore (uses setup.haskell-outputs)
- use `--ignore-project` in `cabal install hackage-repo-tool`
- use GHC_FOR_RELEASE also in validate-old-ghcs
- closes #8858: deleted comment
- closes #9858 by dropping container and using ghcup to setup ghcs

GHCs that do not install on ubuntu-22.04 with GHCup are dropped, meaning we only keep GHC 8.0.2 and up.

(cherry picked from commit 29dc53c)

# Conflicts:
#	.github/workflows/validate.yml

* fix validate.yml conflicts

How is this backport conflicting with _itself_?

* copy an import list from #9551

because `System.Process.Internals` just (like, within the past
hour or so) started exporting a name we are using.

* CI: force MacOS jobs to use Intel runners (macos-13) (backport #9949) (#9956)

* CI: force MacOS jobs to use Intel runners (`macos-13`)

GitHub just switched macos-latest to the ARM chips (now alisasing
`macos-14`), and it brings a bunch of problems.

- First of all, GHC's 8.8 and 8.6 don't exist there.
- ghcup and llvm are unavailable

For the time being, lets stay on the previous version of the runner.

(cherry picked from commit d36e0d0)

* CI: GitHub MacOS runners lost ghcup since 2024-04-27, so use haskell-action/setup instead

(cherry picked from commit 082d952)

* fixup! more compat with new macos runners

(cherry picked from commit 326a1f6)

* !fixup resolve conflicts

* copy an import list from #9551

because `System.Process.Internals` just (like, within the past
hour or so) started exporting a name we are using.

---------

Co-authored-by: Artem Pelenitsyn <[email protected]>
Co-authored-by: brandon s allbery kf8nh <[email protected]>

* Merge branch '3.12' into mergify/bp/3.12/pr-9886

* Update validate.yml

github nicely decided to ~revert~ the OS X validate fix when I rebased on top of it.

* make validate.yml consistent with master
mergify bot added a commit that referenced this pull request May 1, 2024
3.12 changelog fixup (#9922)

* Incorporate Brandon’s suggestions

See #9920.

* Incorporate Artem’s suggestions

See #9920.

* Do not repeat yourself

* Fix release notes grammar (#9924)

* Fix release notes grammar

See #9920.

* Fix whitespace

* Support GHC 9.12

(cherry picked from commit da6bdef)

* Fix changelog/readme (backport #9935) (#9936)

* Fix changelog/readme

(cherry picked from commit ea0f464)

* Remove previous release date

---------

Co-authored-by: Francesco Ariis <[email protected]>

* Tell zlib not to use pkg-config in GitLab CI.

(cherry picked from commit 62c74fe)

* Revert "Mark ForeignLibs test as broken with ghc-8.4.4"

This reverts commit a90d44f.

(cherry picked from commit d0a690b)

* CI: drop validation of GHC 7

Changes:
- bump GHC_FOR_RELEASE to 9.4.8
- bump action versions
- uniform quoting style
- satisfy actionlint
- fix order: setup Haskell before cache restore (uses setup.haskell-outputs)
- use `--ignore-project` in `cabal install hackage-repo-tool`
- use GHC_FOR_RELEASE also in validate-old-ghcs
- closes #8858: deleted comment
- closes #9858 by dropping container and using ghcup to setup ghcs

GHCs that do not install on ubuntu-22.04 with GHCup are dropped, meaning we only keep GHC 8.0.2 and up.

(cherry picked from commit 29dc53c)

# Conflicts:
#	.github/workflows/validate.yml

* fix validate.yml conflicts

How is this backport conflicting with _itself_?

* copy an import list from #9551

because `System.Process.Internals` just (like, within the past
hour or so) started exporting a name we are using.

* CI: force MacOS jobs to use Intel runners (macos-13) (backport #9949) (#9956)

* CI: force MacOS jobs to use Intel runners (`macos-13`)

GitHub just switched macos-latest to the ARM chips (now alisasing
`macos-14`), and it brings a bunch of problems.

- First of all, GHC's 8.8 and 8.6 don't exist there.
- ghcup and llvm are unavailable

For the time being, lets stay on the previous version of the runner.

(cherry picked from commit d36e0d0)

* CI: GitHub MacOS runners lost ghcup since 2024-04-27, so use haskell-action/setup instead

(cherry picked from commit 082d952)

* fixup! more compat with new macos runners

(cherry picked from commit 326a1f6)

* !fixup resolve conflicts

* copy an import list from #9551

because `System.Process.Internals` just (like, within the past
hour or so) started exporting a name we are using.

---------

Co-authored-by: Artem Pelenitsyn <[email protected]>
Co-authored-by: brandon s allbery kf8nh <[email protected]>

* Merge branch '3.12' into mergify/bp/3.12/pr-9886

* Update validate.yml

github nicely decided to ~revert~ the OS X validate fix when I rebased on top of it.

* make validate.yml consistent with master

Co-authored-by: Mikolaj <[email protected]>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
@ulysses4ever
Copy link
Collaborator

I'm a little fuzzy on the process for release notes and backporting. Should this be backported? @Mikolaj @ffaf1

@ffaf1
Copy link
Collaborator Author

ffaf1 commented Jun 6, 2024

Nope, this was a PR for 3.12, forward-ported to master, it should not be backported.

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 squash+merge me Tell Mergify Bot to squash-merge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants