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

Update licence list #9818

Merged
merged 1 commit into from
Mar 22, 2024
Merged

Update licence list #9818

merged 1 commit into from
Mar 22, 2024

Conversation

ffaf1
Copy link
Collaborator

@ffaf1 ffaf1 commented Mar 19, 2024

Per https://github.com/haskell/cabal/wiki/Updating-the-license-list to version 3.23 (2024-02-08) of SPDX License List.


Include the following checklist in your PR:

  • Patches conform to the coding conventions.
  • Any changes that could be relevant to users have been recorded in the changelog.
  • The documentation has been updated, if necessary.
  • not necessary ~~Manual QA notes have been included.
  • not needed Tests have been added. (Ask for help if you don’t know how to write them! Ask for an exemption if tests are too complex for too little coverage!)

@ffaf1 ffaf1 force-pushed the 3.12-licences branch 2 times, most recently from c20cad1 to 983c158 Compare March 19, 2024 10:03
@ffaf1
Copy link
Collaborator Author

ffaf1 commented Mar 19, 2024

After yesterday’s call with Mikolaj, I think this step has to be done before the “bumping version numbers” one.
Let us see what CI says.

A thing that was not mentioned in the wiki is whether this should be forwardported to master.

@ffaf1 ffaf1 force-pushed the 3.12-licences branch 3 times, most recently from 55f41a3 to 692b432 Compare March 19, 2024 18:33
@ffaf1 ffaf1 added merge me Tell Mergify Bot to merge and removed attention: needs-review labels Mar 22, 2024
@ffaf1
Copy link
Collaborator Author

ffaf1 commented Mar 22, 2024

I forgot about this. I will add merge delay passed, since three days have gone by.

@ffaf1 ffaf1 added merge delay passed Applied (usually by Mergify) when PR approved and received no updates for 2 days attention: needs-review and removed merge delay passed Applied (usually by Mergify) when PR approved and received no updates for 2 days merge me Tell Mergify Bot to merge labels Mar 22, 2024
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.

Thank you.

@Mikolaj
Copy link
Member

Mikolaj commented Mar 22, 2024

I'm guessing this should have been done on master and backported. The old wiki page had "note: most of the changes should be done on branch master and backported to the release branch." I guess we should add this to each and every point except the one or two that are best done on release branch [edit: and forward-ported].

BTW, mergify seems stuck, so let me merge manually.

@Mikolaj
Copy link
Member

Mikolaj commented Mar 22, 2024

@mergify rebase

Copy link
Contributor

mergify bot commented Mar 22, 2024

rebase

✅ Nothing to do for rebase action

@Mikolaj
Copy link
Member

Mikolaj commented Mar 22, 2024

@mergify refresh

Copy link
Contributor

mergify bot commented Mar 22, 2024

refresh

✅ Pull request refreshed

@Mikolaj
Copy link
Member

Mikolaj commented Mar 22, 2024

@mergify unqueue

Copy link
Contributor

mergify bot commented Mar 22, 2024

unqueue

☑️ The pull request is not queued

@Mikolaj
Copy link
Member

Mikolaj commented Mar 22, 2024

@mergify requeue

@Mikolaj
Copy link
Member

Mikolaj commented Mar 22, 2024

@mergify queue

@Mikolaj
Copy link
Member

Mikolaj commented Mar 22, 2024

@mergify enqueue

Copy link
Contributor

mergify bot commented Mar 22, 2024

requeue

❌ This pull request head commit has not been previously disembarked from queue.

Copy link
Contributor

mergify bot commented Mar 22, 2024

enqueue

❌ Sorry but I didn't understand the command. Please consult the commands documentation 📚.

Copy link
Contributor

mergify bot commented Mar 22, 2024

queue

✅ The pull request has been merged automatically

The pull request has been merged automatically at e867d30

@mergify mergify bot merged commit e867d30 into haskell:3.12 Mar 22, 2024
56 checks passed
@Mikolaj
Copy link
Member

Mikolaj commented Mar 22, 2024

Hah, queue worked.

@Mikolaj Mikolaj added the attention: needs-backport in the future e.g., to a point release after the main release label Mar 22, 2024
@ffaf1
Copy link
Collaborator Author

ffaf1 commented Mar 22, 2024

@mergify backport master

Copy link
Contributor

mergify bot commented Mar 22, 2024

backport master

✅ Backports have been created

@mergify mergify bot mentioned this pull request Mar 22, 2024
5 tasks
@ffaf1 ffaf1 deleted the 3.12-licences branch March 22, 2024 17:51
@ffaf1 ffaf1 mentioned this pull request Mar 22, 2024
5 tasks
@mergify mergify bot mentioned this pull request Apr 9, 2024
5 tasks
@ulysses4ever
Copy link
Collaborator

@ffaf1 two points on interest.

First,

I will add merge delay passed, since three days have gone by.

The delay is not required for PRs against branches other than master. This is just FYI.

Second, this manual backport has a subtle difference from the original (#9837): the json files in license-list-data don't have newlines at the end. Compare:

Just wanted to share my pain: I spent half a day banging my head against the whitespace GH workflow that fails on 3.12 and works on master because of this subtlety...

@geekosaur
Copy link
Collaborator

The delay is not required for PRs against branches other than master. This is just FYI.

IIRC it's only waived for PRs that are identified as backports.

@ulysses4ever
Copy link
Collaborator

@geekosaur good point. By reading https://github.com/haskell/cabal/blob/master/.github/mergify.yml it appears that if you manually put the backport label, it will do the trick. In this case, it is a manual backport, so the label is justified. But perhaps we should simplify it, since with the current setup, a vanilla (non-backport) PR against a non-master branch will not be served by the bot at all, it looks like.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
attention: needs-backport in the future e.g., to a point release after the main release attention: needs-review
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants