Repository navigation
Fix Publish addons: drop Share-Your-Apps duplicate LICENSE and check for it - #164
Merged
Merged
Conversation
addons tarball injects the repository LICENSE at the archive root, so an addon-level LICENSE at the same path makes _claim() raise 'Share-Your-Apps: LICENSE is claimed twice' and aborts Publish addons (run 43349501901). The tarball still ships LICENSE from the repo root.
The source tarball adds the repository LICENSE at the archive root, so an addon-level copy aborts Publish addons with 'LICENSE is claimed twice'. Catch it on the pull request instead of at publish time.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Problem
Publish addons run 43349501901 fails in Build the source tarballs:
tools/addons/src/addons/tarball.pycopies the addon's tracked files to the archive root and then injects the repository's rootLICENSEat the same path.plugins/Share-Your-Apps/LICENSEis the only addon-level LICENSE in the repo, so it collides. The crash also stopped the remaining tarballs, catalog generation and the R2 publish.The nested
server/project is not involved; itsLICENSEstages atserver/LICENSE.Changes
plugins/Share-Your-Apps/LICENSE.addons checknow fails a plugin that tracks a rootLICENSE, so this is caught on the PR by Check toolchain instead of at publish time. Test added intests/test_check.py.Verification
addons checkpasses; with the old LICENSE restored it fails withShare-Your-Apps: LICENSE at the addon root clashes with the repository LICENSE the source tarball adds; delete it.pytest: 135 passed.addons tarball --only plugins/Share-Your-Appsnow buildsshare-your-apps-src.tar.gz, containingLICENSE(from repo root) andserver/LICENSE.Open question (not changed here)
The removed file was AGPL-3.0; the repository root
LICENSEis GPL-3.0, while the plugin README and the comment intarball.pyboth say AGPL. Someone should confirm which licence is intended.