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 #10336

Merged
merged 5 commits into from
Sep 10, 2024
Merged

Changelogs 3.14 #10336

merged 5 commits into from
Sep 10, 2024

Conversation

ulysses4ever
Copy link
Collaborator

Previous attempt : #10323

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

@ulysses4ever ulysses4ever added release squash+merge me Tell Mergify Bot to squash-merge labels Sep 10, 2024
@mergify mergify bot mentioned this pull request Sep 10, 2024
Closed
1 task
geekosaur
geekosaur approved these changes Sep 10, 2024
View reviewed changes
release-notes/Cabal-3.14.0.0.md Outdated Show resolved Hide resolved
release-notes/Cabal-3.14.0.0.md Outdated Show resolved Hide resolved
release-notes/cabal-install-3.16.0.0.md Outdated Show resolved Hide resolved
release-notes/cabal-install-3.16.0.0.md Outdated Show resolved Hide resolved
@ulysses4ever @geekosaur
Apply suggestions from geekosaur (contd.)
5d89a14 
Co-authored-by: brandon s allbery kf8nh <allbery.b@gmail.com>
ffaf1
ffaf1 approved these changes Sep 10, 2024
View reviewed changes
release-notes/cabal-install-3.16.0.0.md Show resolved Hide resolved
release-notes/cabal-install-3.16.0.0.md Show resolved Hide resolved
release-notes/cabal-install-3.16.0.0.md Show resolved Hide resolved
release-notes/cabal-install-3.16.0.0.md Show resolved Hide resolved
release-notes/cabal-install-3.16.0.0.md Show resolved Hide resolved
release-notes/cabal-install-3.16.0.0.md Show resolved Hide resolved
@mergify mergify bot merged commit 7ee3d54 into 3.14 Sep 10, 2024
54 checks passed
@mergify mergify bot deleted the changelogs-3.14 branch September 10, 2024 03:34
@geekosaur
Copy link
Collaborator

Uh, why was the merge label set before it was ready to merge?

@geekosaur geekosaur restored the changelogs-3.14 branch September 10, 2024 03:46
@geekosaur
Copy link
Collaborator

Do we want to quickly do a PR reverting this and re-commit when it's ready, or force-push it away since nobody should be using 3.14 yet?

geekosaur added a commit that referenced this pull request Sep 10, 2024
@geekosaur
Revert "Changelogs 3.14 (#10336)"
610634f 
This reverts commit 7ee3d54.
@geekosaur geekosaur mentioned this pull request Sep 10, 2024
Closed
@geekosaur
Copy link
Collaborator

There doesn't appear to be a way to reopen a merged PR, even for an admin.

@ulysses4ever
Copy link
Collaborator Author

Sorry, I jumped the gun with the label. I'll open another PR applying the suggestions.

@geekosaur
Copy link
Collaborator

The problem with that is some of those wanted discussion, I think — and that discussion will be lost. Unfortunately, there doesn't seem to be a way around this.

@geekosaur
Copy link
Collaborator

While checking for changes in the PR won't catch comments, they should actually be available and it should be possible to craft Mergify rules for them. I'll need to set up a test repo and play around with it to see what actually works. Unfortunately, between life and the amount of time I've been spending in doctors' offices of late (which has made the life issues worse), this will probably take some time.

@ulysses4ever
Copy link
Collaborator Author

The problem with that is some of those wanted discussion, I think — and that discussion will be lost.

Yes, but nothing says we can't continue discussions on the new PR. It's not optimal but it's certainly doable.

@mergify mergify bot added the merge delay passed Applied (usually by Mergify) when PR approved and received no updates for 2 days label Sep 12, 2024
@Kleidukos Kleidukos mentioned this pull request Sep 12, 2024
Open
20 tasks
ffaf1 pushed a commit to ffaf1/cabal that referenced this pull request Sep 12, 2024
@ulysses4ever @geekosaur @ffaf1
Changelogs 3.14 (haskell#10336)
7d7fc12 
* changelogs for Cabal-3.14 and (incomplete) cabal-install-3.16

* cleanup changelog-d files afer creating the 3.14 changelog

* Apply suggestions from geekosaur

Co-authored-by: brandon s allbery kf8nh <allbery.b@gmail.com>

* Apply more suggestions from geekosaur

* Apply suggestions from geekosaur (contd.)

Co-authored-by: brandon s allbery kf8nh <allbery.b@gmail.com>

---------

Co-authored-by: brandon s allbery kf8nh <allbery.b@gmail.com>
@ffaf1 ffaf1 mentioned this pull request Sep 12, 2024
Merged
2 tasks
ffaf1 pushed a commit to ffaf1/cabal that referenced this pull request Sep 12, 2024
@ulysses4ever @geekosaur @ffaf1
Changelogs 3.14 (haskell#10336)
07084c2 
* changelogs for Cabal-3.14 and (incomplete) cabal-install-3.16

* cleanup changelog-d files afer creating the 3.14 changelog

* Apply suggestions from geekosaur

Co-authored-by: brandon s allbery kf8nh <allbery.b@gmail.com>

* Apply more suggestions from geekosaur

* Apply suggestions from geekosaur (contd.)

Co-authored-by: brandon s allbery kf8nh <allbery.b@gmail.com>

---------

Co-authored-by: brandon s allbery kf8nh <allbery.b@gmail.com>
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
@geekosaur geekosaur deleted the changelogs-3.14 branch September 15, 2024 22:33
@geekosaur
Copy link
Collaborator

So for the record, we were missing a branch protection rule requiring that all review comments be resolved before merging.

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

@ffaf1 ffaf1 ffaf1 approved these changes

@geekosaur geekosaur geekosaur approved these changes

@Mikolaj Mikolaj Awaiting requested review from Mikolaj

@Kleidukos Kleidukos Awaiting requested review from Kleidukos

Assignees
No one assigned
Labels
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
Milestone
No milestone
Development

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