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.

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

skip submodule updating logics on tarballs #137338

Merged
merged 1 commit into from
Feb 21, 2025
Merged

Conversation

onur-ozkan
Copy link
Member

@onur-ozkan onur-ozkan commented Feb 20, 2025

Running submodule logic on tarballs isn't necessary since git isn't available there.

Fixes #137332

Signed-off-by: onur-ozkan <work@onurozkan.dev>
@rustbot
Copy link
Collaborator

rustbot commented Feb 20, 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 20, 2025
@rustbot
Copy link
Collaborator

rustbot commented Feb 20, 2025

This PR modifies src/bootstrap/src/core/config.

If appropriate, please update CONFIG_CHANGE_HISTORY in src/bootstrap/src/utils/change_tracker.rs.

@Kobzol
Copy link
Contributor

Kobzol commented Feb 20, 2025

I wanted to write a dummy file into src/gcc/notice.txt in the src archives, but this should also work. You can r=me once CI is green.

@onur-ozkan
Copy link
Member Author

onur-ozkan commented Feb 20, 2025

We can still do that as an addition I think (running submodules logic doesn't make sense even if there wasn't a gcc issue). Maybe with src/gcc/.gitkeep file that contains "not available on tarball sources" content.

@Kobzol
Copy link
Contributor

Kobzol commented Feb 20, 2025

Yeah, that is orthogonal. #137340

@onur-ozkan
Copy link
Member Author

@bors r=Kobzol rollup

@bors
Copy link
Contributor

bors commented Feb 20, 2025

📌 Commit d2203ad 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 20, 2025
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 21, 2025
…kingjubilee

Rollup of 12 pull requests

Successful merges:

 - rust-lang#131651 (Create a generic AVR target: avr-none)
 - rust-lang#134340 (Stabilize `num_midpoint_signed` feature)
 - rust-lang#136473 (infer linker flavor by linker name if it's sufficiently specific)
 - rust-lang#136608 (Pass through of target features to llvm-bitcode-linker and handling them)
 - rust-lang#136985 (Do not ignore uninhabited types for function-call ABI purposes. (Remove BackendRepr::Uninhabited))
 - rust-lang#137270 (Fix `*-win7-windows-msvc` target since 26eeac1)
 - rust-lang#137312 (Update references to cc_detect.rs)
 - rust-lang#137318 (Workaround Cranelift not yet properly supporting vectors smaller than 128bit)
 - rust-lang#137322 (Update docs for default features of wasm targets)
 - rust-lang#137324 (Make x86 QNX target name consistent with other Rust targets)
 - rust-lang#137338 (skip submodule updating logics on tarballs)
 - rust-lang#137340 (Add a notice about missing GCC sources into source tarballs)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 02ceb5f into rust-lang:master Feb 21, 2025
6 checks passed
@rustbot rustbot added this to the 1.87.0 milestone Feb 21, 2025
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Feb 21, 2025
Rollup merge of rust-lang#137338 - onur-ozkan:137332, r=Kobzol

skip submodule updating logics on tarballs

Running submodule logic on tarballs isn't necessary since git isn't available there.

Fixes rust-lang#137332
@onur-ozkan onur-ozkan deleted the 137332 branch February 21, 2025 08:41
@onur-ozkan
Copy link
Member Author

@rustbot label +stable-nominated +beta-nominated

@rustbot rustbot added beta-nominated Nominated for backporting to the compiler in the beta channel. stable-nominated Nominated for backporting to the compiler in the stable channel. labels Feb 24, 2025
@onur-ozkan
Copy link
Member Author

@rustbot label +stable-accepted +beta-accepted

Check out the decision.

@rustbot rustbot added beta-accepted Accepted for backporting to the compiler in the beta channel. stable-accepted Accepted for backporting to the compiler in the stable channel. labels Feb 25, 2025
@cuviper cuviper mentioned this pull request Feb 27, 2025
@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
[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
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. stable-accepted Accepted for backporting to the compiler in the stable channel. stable-nominated Nominated for backporting to the compiler in the stable channel. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Can't run x.py dist on rust 1.85.0 source distribution
5 participants