add complete copyright/licensing info to source tarball #1375
Conversation
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
src/bootstrap/src/ferrocene/dist.rs
Outdated
| @@ -138,6 +141,11 @@ impl Step for SourceTarball { | |||
| subsetter.add_file(&builder.src, &builder.src.join(item)); | |||
| } | |||
|
|
|||
| // Generate comprehensive copyright data and include the generated files | |||
| for item in builder.ensure(GenerateCopyright) { | |||
| subsetter.add_file(&builder.src, &item); | |||
There was a problem hiding this comment.
What will be the path COPYRIGHT.html and COPYRIGHT-library.html will be copied to? They should be placed at the top level, not inside the build/ directory in the tarball (if that's the case).
There was a problem hiding this comment.
that is what happens... will adjust
0e5d525 to
d1de901
Compare
|
am unsure about the latest commit... writing to the root of the repo smells unpleasant |
|
Yeah we should find a better approach. If you look at the implementation of subsetter.add_file(&path.parent().unwrap(), &path); |
d1de901 to
5bbe736
Compare
|
bors try |
tryBuild failed: |
5bbe736 to
bddba99
Compare
This currently adds the following files: - build/COPYRIGHT.html - build/COPYRIGHT-library.html - license-metadata.json
bddba99 to
d3dc1cc
Compare
|
🕐 Waiting for PR status (Github check) to be set, probably by CI. Bors will automatically try to run when all required PR statuses are set. |
|
Build succeeded: |
ferrocene-automations bot
pushed a commit
that referenced
this pull request
Apr 8, 2025
This currently adds the following files: - build/COPYRIGHT.html - build/COPYRIGHT-library.html - license-metadata.json Ferrocene-backport-of: #1375
bors-ferrocene bot
added a commit
that referenced
this pull request
Apr 9, 2025
1398: Backport to `release/1.86` r=tshepang a=ferrocene-automations[bot] This PR backports the following PRs to the `release/1.86` branch: * #1326 * #1342 * #1350 * #1370 * #1377 * #1375 Co-authored-by: Tshepang Mbambo <tshepang.mbambo@ferrous-systems.com> Co-authored-by: Ana Hobden <operator@hoverbear.org> Co-authored-by: Lukas Wirth <lukas.wirth@ferrous-systems.com> Co-authored-by: Samuel Wright <samuel.wright@ferrous-systems.com>
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.
Upstream recently added an automated way of generating copyright files (rust-lang/rust#135588), so we also need to do similar, because we have a different way of generating release tarballs.