-
Notifications
You must be signed in to change notification settings - Fork 140
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
feat: re-add licenses by SPDX identifier, mark shorthand aliases as deprecated #1560
Conversation
…eprecated Signed-off-by: Edward Ly <[email protected]>
1218fb5
to
deadf1d
Compare
Besides my comments this looks good to me, yet this can only be merged after the same PR has been merged on server v31.0.0, to ensure v31.0.0 (and later) won't break. |
This will probably be done by me. CI is expected to fail, it is broken due to invalid translations. I have informed @nickvergessen about this situation, for now I will temporarily remove the translations from the repository (but they will be returned by the bot again soon) Edited: CI should be fixed now, thanks to Joas! |
…ecated. matching the app store change at nextcloud/appstore#1560 Signed-off-by: Andy Scherzinger <[email protected]>
Signed-off-by: Edward Ly <[email protected]>
Andy's suggestions have now been applied. By the way, with the new license IDs, I've been thinking maybe we need to change the way the license is displayed in the server as well (e.g. here), but I'll leave it up to you whether anything needs to be done about it or not. |
50754b2
to
e98fe07
Compare
I had a similar thought if we should just drop the "-licensed" in the rendering |
Signed-off-by: Edward Ly <[email protected]>
Signed-off-by: Edward Ly <[email protected]>
e98fe07
to
3560d00
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
looks good to me
Matches the change made by @AndyScherzinger in nextcloud/documentation#12490 Signed-off-by: Edward Ly <[email protected]>
👍 |
Btw can someone script PRs to update the license identifiers of all apps built by the company? If they were built after the OC split then we can safely assume that AGPL-3.0-or-later is meant. Alternatively if no direct change is possible due to ambiguity it would be nice to open an issue in each repo to warn about this. |
Resolves #1274.
Adds the SPDX identifiers for the currently supported licenses as valid enum values for the
<licence>
tag. Automatically convertsapache
,mit
, andmpl
toApache-2.0
,MIT
, andMPL-2.0
, respectively, when importing or creating a new app release.agpl
andgpl3
are left alone for now as they are implicitly assumed to map toAGPL-3.0
andGPL-3.0
, but those identifiers are also deprecated themselves.Feel free to correct me if I'm wrong, but that was my interpretation based on the discussion so far.
Tasks for the app store admin (who I believe is @Altahrim?) after merging:
Licenses
table: