Skip to content

Add 3.10.1.0 changelogs and remove the used up tiny changlog files #8831

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 1 commit into from
Mar 8, 2023

Conversation

Mikolaj
Copy link
Member

@Mikolaj Mikolaj commented Mar 6, 2023

The remaining chagelog files are indeed those we haven't managed to fit it. I haven't checked if the removed files match what's in the changelog documents themselves nor did I check all the PRs mentioned in the changelog-d utility warnings (https://paste.tomsmeding.com/N5YLPa58; many or most of which seem to be false positives).

I've created the files strictly following https://github.com/haskell/cabal/wiki/Making-a-release

@ulysses4ever
Copy link
Collaborator

I'm not a big fan of repeating important changes to Cabal in cabal-install changelog: they're already out of sync (besides, I'm not sure it's all that helpful).

@Mikolaj
Copy link
Member Author

Mikolaj commented Mar 6, 2023

I'm not a big fan of repeating important changes to Cabal in cabal-install changelog: they're already out of sync (besides, I'm not sure it's all that helpful).

Sure. But I suggest we should rather educate PR authors (and improve our CONTRIBUTING material) than patch the changelogs. Please open a ticket about it if you have a short outline of the policy change we could enact.

@Mikolaj Mikolaj added the squash+merge me Tell Mergify Bot to squash-merge label Mar 7, 2023
@Mikolaj Mikolaj force-pushed the changelogs-of-3.10.1.0 branch from fcc6600 to f8f2692 Compare March 7, 2023 14:50
@Mikolaj Mikolaj added merge me Tell Mergify Bot to merge and removed squash+merge me Tell Mergify Bot to squash-merge labels Mar 7, 2023
@ulysses4ever
Copy link
Collaborator

Sure. But I suggest we should rather educate PR authors (and improve our CONTRIBUTING material) than patch the changelogs. Please open a ticket about it if you have a short outline of the policy change we could enact.

Mm, perhaps I didn't get what this means:

  • Cabal-3.10.1.0 is used, which brings its own set of changes,
    many of which are significant. The Cabal and Cabal-syntax changes that touch
    the cabal-install or cabal-install-solver codebases are pasted here again in full.

I meant the "pasted" bit. Can we not paste anything that has already been said somewhere? It's a way to disaster usually. But if it's a consequence of people putting "component: Cabal, cabal-install" in the changelogs, than I don't suggest we add even more work for the release and remove them manually.

@Mikolaj
Copy link
Member Author

Mikolaj commented Mar 7, 2023

I meant the "pasted" bit. Can we not paste anything that has already been said somewhere? It's a way to disaster usually. But if it's a consequence of people putting "component: Cabal, cabal-install" in the changelogs, than I don't suggest we add even more work for the release and remove them manually.

Oh, yes, I meant 'pasted by the changelog-d utility due to users saying "component: Cabal, cabal-install"'. I haven't pasted anything manually. I'm lazy. I also haven't removed manually (almost) anything.

Copy link
Member Author

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

github marks some of my comments as Pending, so let me see if finishing a review fixes that

Edit: it did.

Edit2: though the comments are misplaced. Let me copy them where they belong.

Edit3: oh no, they are already copied there.

@ulysses4ever
Copy link
Collaborator

@Mikolaj how about pulling up haddock-project to the list of significant changes?

@Mikolaj Mikolaj force-pushed the changelogs-of-3.10.1.0 branch 2 times, most recently from 7a0247d to 45c31c6 Compare March 7, 2023 16:15
@Mikolaj
Copy link
Member Author

Mikolaj commented Mar 7, 2023

@Mikolaj how about pulling up haddock-project to the list of significant changes?

Right. Done.

@Mikolaj Mikolaj added the merge delay passed Applied (usually by Mergify) when PR approved and received no updates for 2 days label Mar 8, 2023
@Mikolaj
Copy link
Member Author

Mikolaj commented Mar 8, 2023

@mergify backport 3.10

@mergify
Copy link
Contributor

mergify bot commented Mar 8, 2023

backport 3.10

❌ No backport have been created

  • Backport to branch 3.10 failed

Git reported the following error:

To https://github.com/haskell/cabal
 ! [rejected]            mergify/bp/3.10/pr-8831 -> mergify/bp/3.10/pr-8831 (non-fast-forward)
error: failed to push some refs to 'https://github.com/haskell/cabal'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Integrate the remote changes (e.g.
hint: 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.

@Mikolaj
Copy link
Member Author

Mikolaj commented Mar 8, 2023

let me speed up the merging of cabal 3.10 changelogs so that we have candidates ready for tomorrows dev's meeting

@mergify mergify bot merged commit dbf41d5 into haskell:master Mar 8, 2023
@Mikolaj
Copy link
Member Author

Mikolaj commented Mar 8, 2023

@mergify backport 3.10

@mergify
Copy link
Contributor

mergify bot commented Mar 8, 2023

backport 3.10

❌ No backport have been created

  • Backport to branch 3.10 failed

Git reported the following error:

To https://github.com/haskell/cabal
 ! [rejected]            mergify/bp/3.10/pr-8831 -> mergify/bp/3.10/pr-8831 (non-fast-forward)
error: failed to push some refs to 'https://github.com/haskell/cabal'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Integrate the remote changes (e.g.
hint: 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.

@Mikolaj
Copy link
Member Author

Mikolaj commented Mar 8, 2023

@mergify rebase

@Mikolaj
Copy link
Member Author

Mikolaj commented Mar 8, 2023

@mergify backport 3.10

@mergify
Copy link
Contributor

mergify bot commented Mar 8, 2023

rebase

☑️ Nothing to do

  • -closed [:pushpin: rebase requirement]

@mergify
Copy link
Contributor

mergify bot commented Mar 8, 2023

backport 3.10

❌ No backport have been created

  • Backport to branch 3.10 failed

Git reported the following error:

To https://github.com/haskell/cabal
 ! [rejected]            mergify/bp/3.10/pr-8831 -> mergify/bp/3.10/pr-8831 (non-fast-forward)
error: failed to push some refs to 'https://github.com/haskell/cabal'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Integrate the remote changes (e.g.
hint: 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.

@andreasabel
Copy link
Member

let me speed up the merging of cabal 3.10 changelogs so that we have candidates ready for tomorrows dev's meeting

@Mikolaj : Sorry, I am travelling atm, so I missed the meeting and the latest action here. Hope you got the necessary feedback yesterday.

@Mikolaj
Copy link
Member Author

Mikolaj commented Mar 10, 2023

Yes, @andreasabel, we are fine. :) Have a great trip!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
attention: needs-review merge delay passed Applied (usually by Mergify) when PR approved and received no updates for 2 days merge me Tell Mergify Bot to merge re: changelog Concerning the change log release
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants