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

Provide explanation for invalid license identifier #6200

Merged
merged 1 commit into from
Feb 28, 2022
Merged

Provide explanation for invalid license identifier #6200

merged 1 commit into from
Feb 28, 2022

Conversation

toonn
Copy link
Contributor

@toonn toonn commented Aug 20, 2019

After discussion in #hackage it seemed prudent to me to add some minimal
explanation of what a valid SPDX identifier might look like to the error
message.

I haven't tested the code and added [ci skip] because I'd like to invite comments about wording first.

Please 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.
  • If the change is docs-only, [ci skip] is used to avoid triggering the build bots.

Please also shortly describe how you tested your change. Bonus points for added tests!

@toonn
Copy link
Contributor Author

toonn commented Nov 5, 2020

@phadej, should I rebase this PR? I'm not sure why it's not been merged yet.

@gbaz
Copy link
Collaborator

gbaz commented Aug 12, 2021

If you rebase this PR I think it should be merged. Sorry it fell through the cracks!

@toonn toonn force-pushed the cabal-init-SPDX-advice branch from a519e77 to 125552b Compare August 12, 2021 18:13
@gbaz gbaz added the squash+merge me Tell Mergify Bot to squash-merge label Feb 24, 2022
@toonn
Copy link
Contributor Author

toonn commented Feb 25, 2022

Let me know if another rebase on my part is required.

@Mikolaj
Copy link
Member

Mikolaj commented Feb 25, 2022

@toonn: indeed, that would be helpful.

@toonn toonn force-pushed the cabal-init-SPDX-advice branch from 125552b to f62f655 Compare February 26, 2022 14:23
@Mikolaj
Copy link
Member

Mikolaj commented Feb 28, 2022

Something seems broken with CI. Let me take the liberty and rebase again.

@Mikolaj
Copy link
Member

Mikolaj commented Feb 28, 2022

@Mergifyio rebase

@mergify
Copy link
Contributor

mergify bot commented Feb 28, 2022

rebase

☑️ Nothing to do

  • -closed [:pushpin: rebase requirement]
  • #commits-behind>0 [:pushpin: rebase requirement]

@Mikolaj
Copy link
Member

Mikolaj commented Feb 28, 2022

@Mergifyio rebase

@mergify
Copy link
Contributor

mergify bot commented Feb 28, 2022

rebase

✅ Branch has been successfully rebased

@jneira jneira force-pushed the cabal-init-SPDX-advice branch from f62f655 to a42af11 Compare February 28, 2022 07:27
@jneira
Copy link
Member

jneira commented Feb 28, 2022

It seems the [ci skip] in the commit message is making skip all workflows and branch protection rules needs them green. The commit needs to be ammended

@toonn @jneira
Provide explanation for invalid license identifier
0d2bab6 
After discussion in #hackage it seemed prudent to add some minimal
explanation of what a valid SPDX identifier might look like in the error
message.
@jneira jneira force-pushed the cabal-init-SPDX-advice branch from a42af11 to 0d2bab6 Compare February 28, 2022 08:55
@jneira
Copy link
Member

jneira commented Feb 28, 2022

@toonn i hope you dont mind i ammended the commit message to unblock ci

@jneira jneira mentioned this pull request Feb 28, 2022
Merged
@mergify mergify bot merged commit 44c2e1a into haskell:master Feb 28, 2022
@toonn
Copy link
Contributor Author

toonn commented Feb 28, 2022

Ah, this is probably because Github Actions now automatically skip commits tagged this way? I only did it to try to adhere to the contributing guidelines, since it'd be a waste building everything for such a small change in output.

Thanks for getting this merged, @gbaz, @Mikolaj, @jneira!

@Mikolaj
Copy link
Member

Mikolaj commented Feb 28, 2022

@toonn: thank you!

I can't find a mention of [ci skip] in https://github.com/haskell/cabal/blob/master/CONTRIBUTING.md (nor anywhere else). Have we removed that while your PR was in the works? Asking to weed out any misleading mentions.

@toonn
Copy link
Contributor Author

toonn commented Feb 28, 2022

@Mikolaj, yep, cc59881.

@Mikolaj
Copy link
Member

Mikolaj commented Feb 28, 2022

Got it. Thank you again.

Kleidukos pushed a commit to Kleidukos/cabal that referenced this pull request Mar 30, 2022
@toonn @Kleidukos
Provide explanation for invalid license identifier (haskell#6200)
4307144 
After discussion in #hackage it seemed prudent to add some minimal
explanation of what a valid SPDX identifier might look like in the error
message.
andreabedini pushed a commit to andreabedini/cabal that referenced this pull request May 5, 2022
@toonn @andreabedini
Provide explanation for invalid license identifier (haskell#6200)
7062c45 
After discussion in #hackage it seemed prudent to add some minimal
explanation of what a valid SPDX identifier might look like in the error
message.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gbaz gbaz gbaz approved these changes

@phadej phadej phadej approved these changes

Assignees
No one assigned
Labels
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.
5 participants
@toonn @gbaz @Mikolaj @jneira @phadej