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

Pass vendored sources from bootstrap to generate-copyright #137020

Merged
merged 4 commits into from
Feb 18, 2025
Merged

Pass vendored sources from bootstrap to generate-copyright #137020

merged 4 commits into from
Feb 18, 2025

Conversation

pietroalbini
Copy link
Member

In addition to doing the vendoring in bootstrap, this PR also loads the list of manifests to parse from bootstrap (instead of hardcoding a smaller list in generate-copyright). This is best reviewed commit-by-commit.

Fixes #136955

@rustbot
Copy link
Collaborator

rustbot commented Feb 14, 2025

r? @Kobzol

rustbot has assigned @Kobzol.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels Feb 14, 2025
@pietroalbini pietroalbini mentioned this pull request Feb 14, 2025
Open
Kobzol
Kobzol reviewed Feb 14, 2025
View reviewed changes
Copy link
Contributor

@Kobzol Kobzol left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Awesome, I wanted to do commit 2 some time ago, but forgot about it. Left some comments.

@pietroalbini
Copy link
Member Author

Will address the rest of the feedback on monday.

@pietroalbini
Copy link
Member Author

Addressed all review feedback. While I was at it, I also updated the plain source tarball step to use the Vendor step, merging all uses of vendoring inside of bootstrap into the Vendor step!

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@Kobzol
Copy link
Contributor

Kobzol commented Feb 17, 2025

Looks great, nice simplification! You can r=me once CI is green.

@pietroalbini
Copy link
Member Author

@bors r=Kobzol

@bors
Copy link
Contributor

bors commented Feb 17, 2025

📌 Commit 92f31b9 has been approved by Kobzol

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Feb 17, 2025
@matthiaskrgr matthiaskrgr mentioned this pull request Feb 17, 2025
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 18, 2025
@bors
Auto merge of rust-lang#137176 - matthiaskrgr:rollup-eht05gr, r=matth…
de91711 
…iaskrgr

Rollup of 9 pull requests

Successful merges:

 - rust-lang#136959 (Simplify switch sources)
 - rust-lang#137020 (Pass vendored sources from bootstrap to generate-copyright)
 - rust-lang#137073 (boostrap: skip no_std targets in Std doc step)
 - rust-lang#137165 (Use `tell` for `<File as Seek>::stream_position`)
 - rust-lang#137166 (Update default loongarch code model in docs)
 - rust-lang#137168 (correct comment)
 - rust-lang#137169 (CI: rfl: move job forward to Linux v6.14-rc3)
 - rust-lang#137170 (Allow configuring jemalloc per target)
 - rust-lang#137173 (Subtree update of `rust-analyzer`)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 48543dd into rust-lang:master Feb 18, 2025
6 checks passed
@rustbot rustbot added this to the 1.87.0 milestone Feb 18, 2025
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Feb 18, 2025
@rust-timer
Unrolled build for rust-lang#137020
79aec9b 
Rollup merge of rust-lang#137020 - ferrocene:pa-vendor-sources, r=Kobzol

Pass vendored sources from bootstrap to generate-copyright

In addition to doing the vendoring in bootstrap, this PR also loads the list of manifests to parse from bootstrap (instead of hardcoding a smaller list in generate-copyright). This is best reviewed commit-by-commit.

Fixes rust-lang#136955
@pietroalbini pietroalbini deleted the pa-vendor-sources branch February 18, 2025 10:52
@erickt
Copy link
Contributor

erickt commented Feb 18, 2025

@pietroalbini - it seems this patch has broken our Rust mirror for Fuchsia. We've had to exclude rustc-perf from our local mirror since it has a pretty complicated licensing story. Rust previously built fine for us since we weren't running the performance tests, but with this patch we're now getting this error:

submodule src/tools/rustc-perf does not appear to be checked out, but it is required for this step
Consider setting `build.submodules = true` or manually initializing the submodules.

Is there any way we could work around this, or add a flag where we could skip this check?

@saethlin saethlin added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Feb 19, 2025
@jieyouxu
Copy link
Member

jieyouxu commented Feb 19, 2025 •
edited
Loading

@pietroalbini - it seems this patch has broken our Rust mirror for Fuchsia. We've had to exclude rustc-perf from our local mirror since it has a pretty complicated licensing story. Rust previously built fine for us since we weren't running the performance tests, but with this patch we're now getting this error:

submodule src/tools/rustc-perf does not appear to be checked out, but it is required for this step
Consider setting `build.submodules = true` or manually initializing the submodules.

Is there any way we could work around this, or add a flag where we could skip this check?

EDIT: oh I see, this is requiring more submodules than previously I think.

Let's discussion your configuration separately in #137272 as IMO this change itself is correct.

@jieyouxu jieyouxu mentioned this pull request Feb 19, 2025
Open
@arthurzam arthurzam mentioned this pull request Feb 20, 2025
Closed
4 tasks
@Kobzol Kobzol mentioned this pull request Feb 21, 2025
Merged
@jieyouxu
Copy link
Member

jieyouxu commented Feb 23, 2025 •
edited
Loading

Discussed and beta backport approved on zulip.

@rustbot label: +beta-accepted

@rustbot rustbot added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Feb 23, 2025
@ehuss ehuss mentioned this pull request Feb 23, 2025
Closed
@cuviper cuviper mentioned this pull request Feb 27, 2025
Merged
@cuviper cuviper modified the milestones: 1.87.0, 1.86.0 Feb 27, 2025
@cuviper cuviper removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Feb 27, 2025
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 2, 2025
@bors
Auto merge of rust-lang#137747 - cuviper:beta-next, r=cuviper
61e1603 
[beta] backports

- Pass vendored sources from bootstrap to generate-copyright rust-lang#137020
- Fix `-win7-windows-msvc` target since 26eeac1* rust-lang#137270
- skip submodule updating logics on tarballs rust-lang#137338
- Improve behavior of `IF_LET_RESCOPE` around temporaries and place expressions rust-lang#137444
- downgrade bootstrap `cc` rust-lang#137460
- Remove latest Windows SDK from 32-bit CI rust-lang#137753
- [beta-1.86] Ensure we can package directories ending with '.rs' (rust-lang/cargo#15248) rust-lang#137842

r? cuviper
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Kobzol Kobzol Kobzol left review comments

Assignees

@Kobzol Kobzol

Labels
beta-accepted Accepted for backporting to the compiler in the beta channel. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)
Projects
None yet
Milestone
1.86.0
Development

Successfully merging this pull request may close these issues.

GenerateCopyright attempts to vendor sources during installation
9 participants
@pietroalbini @rustbot @rust-log-analyzer @Kobzol @bors @erickt @jieyouxu @cuviper @saethlin