Skip to content

skip submodule updating logics on tarballs #137338

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Jump to bottom
Merged
merged 1 commit into from
Feb 21, 2025
Merged

skip submodule updating logics on tarballs #137338

merged 1 commit into from
Feb 21, 2025

Conversation

onur-ozkan
Copy link
Member

@onur-ozkan onur-ozkan commented Feb 20, 2025 •
edited
Loading

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

Fixes #137332

@onur-ozkan
skip submodule updating logics on tarballs
d2203ad 
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 •
edited
Loading

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
Collaborator

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
@workingjubilee workingjubilee mentioned this pull request Feb 20, 2025
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 21, 2025
@bors
Auto merge of rust-lang#137346 - workingjubilee:rollup-sxu05ms, r=wor…
a18bd8a 
…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
@rust-timer
Unrolled build for rust-lang#137338
f6cd6ea 
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
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
@fossdd fossdd mentioned this pull request Mar 6, 2025
Closed
@cuviper cuviper mentioned this pull request Mar 14, 2025
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 14, 2025
@bors
Auto merge of rust-lang#138521 - cuviper:stable-next, r=<try>
59f1047 
[stable] Release 1.85.1

- [Fix the doctest-merging feature of the 2024 Edition.](rust-lang#137899)
- [Relax some `target_feature` checks when generating docs.](rust-lang#137632)
  - DRAFT NOTE: this is not formally `stable-accepted` yet. It also required some fixup to deal with differences in the `Stability` system, but I think it should have the same effect, limited to `rustdoc` execution.
- [Fix errors in `fs::rename` on Windows 1607.](rust-lang#137528)
- [Downgrade bootstrap `cc` to fix custom targets.](rust-lang#137460)
- [Skip submodule updates when building Rust from a source tarball.](rust-lang#137338)

cc `@rust-lang/release`
r? cuviper

try-job: dist-x86_64-linux
try-job: dist-i686-msvc
try-job: x86_64-rust-for-linux
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 15, 2025
@bors
Auto merge of rust-lang#138521 - cuviper:stable-next, r=<try>
13dd86b 
[stable] Release 1.85.1

- [Fix the doctest-merging feature of the 2024 Edition.](rust-lang#137899)
- [Relax some `target_feature` checks when generating docs.](rust-lang#137632)
  - DRAFT NOTE: this is not formally `stable-accepted` yet. It also required some fixup to deal with differences in the `Stability` system, but I think it should have the same effect, limited to `rustdoc` execution.
- [Fix errors in `fs::rename` on Windows 1607.](rust-lang#137528)
- [Downgrade bootstrap `cc` to fix custom targets.](rust-lang#137460)
- [Skip submodule updates when building Rust from a source tarball.](rust-lang#137338)

cc `@rust-lang/release`
r? cuviper

try-job: dist-x86_64-linux
try-job: dist-i686-msvc
try-job: x86_64-rust-for-linux
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 15, 2025
@bors
Auto merge of rust-lang#138521 - cuviper:stable-next, r=<try>
d8350f1 
[stable] Release 1.85.1

- [Fix the doctest-merging feature of the 2024 Edition.](rust-lang#137899)
- [Relax some `target_feature` checks when generating docs.](rust-lang#137632)
  - DRAFT NOTE: this is not formally `stable-accepted` yet. It also required some fixup to deal with differences in the `Stability` system, but I think it should have the same effect, limited to `rustdoc` execution.
- [Fix errors in `fs::rename` on Windows 1607.](rust-lang#137528)
- [Downgrade bootstrap `cc` to fix custom targets.](rust-lang#137460)
- [Skip submodule updates when building Rust from a source tarball.](rust-lang#137338)

cc `@rust-lang/release`
r? cuviper

try-job: dist-x86_64-linux
try-job: dist-i686-msvc
try-job: i686-msvc
try-job: x86_64-rust-for-linux
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 15, 2025
@bors
Auto merge of rust-lang#138521 - cuviper:stable-next, r=<try>
bb3a07a 
[stable] Release 1.85.1

- [Fix the doctest-merging feature of the 2024 Edition.](rust-lang#137899)
- [Relax some `target_feature` checks when generating docs.](rust-lang#137632)
  - DRAFT NOTE: this is not formally `stable-accepted` yet. It also required some fixup to deal with differences in the `Stability` system, but I think it should have the same effect, limited to `rustdoc` execution.
- [Fix errors in `fs::rename` on Windows 1607.](rust-lang#137528)
- [Downgrade bootstrap `cc` to fix custom targets.](rust-lang#137460)
- [Skip submodule updates when building Rust from a source tarball.](rust-lang#137338)

cc `@rust-lang/release`
r? cuviper

try-job: dist-x86_64-linux
try-job: dist-i686-msvc
try-job: i686-msvc
try-job: x86_64-rust-for-linux
@cuviper cuviper removed the stable-nominated Nominated for backporting to the compiler in the stable channel. label Mar 15, 2025
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 15, 2025
@bors
Auto merge of rust-lang#138521 - cuviper:stable-next, r=cuviper
4eb1612 
[stable] Release 1.85.1

- [Fix the doctest-merging feature of the 2024 Edition.](rust-lang#137899)
- [Relax some `target_feature` checks when generating docs.](rust-lang#137632)
- [Fix errors in `std::fs::rename` on Windows 1607.](rust-lang#137528)
- [Downgrade bootstrap `cc` to fix custom targets.](rust-lang#137460)
- [Skip submodule updates when building Rust from a source tarball.](rust-lang#137338)

Added backports to fix CI:

- Remove latest Windows SDK from 32-bit CI rust-lang#137753
- Do not install rustup on Rust for Linux job rust-lang#137947

cc `@rust-lang/release`
r? cuviper
@cuviper cuviper modified the milestones: 1.86.0, 1.85.1 Mar 15, 2025
tmeijn pushed a commit to tmeijn/dotfiles that referenced this pull request Mar 25, 2025
build(deps): update rust to v1.85.1
5ef4e5d 
This MR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [rust](https://github.com/rust-lang/rust) | patch | `1.85.0` -> `1.85.1` |

MR created with the help of [el-capitano/tools/renovate-bot](https://gitlab.com/el-capitano/tools/renovate-bot).

**Proposed changes to behavior should be submitted there as MRs.**

---

### Release Notes

<details>
<summary>rust-lang/rust (rust)</summary>

### [`v1.85.1`](https://github.com/rust-lang/rust/blob/HEAD/RELEASES.md#Version-1851-2025-03-18)

[Compare Source](rust-lang/rust@1.85.0...1.85.1)

\==========================

<a id="1.85.1"></a>

-   [Fix the doctest-merging feature of the 2024 Edition.](rust-lang/rust#137899)
-   [Relax some `target_feature` checks when generating docs.](rust-lang/rust#137632)
-   [Fix errors in `std::fs::rename` on Windows 10, version 1607.](rust-lang/rust#137528)
-   [Downgrade bootstrap `cc` to fix custom targets.](rust-lang/rust#137460)
-   [Skip submodule updates when building Rust from a source tarball.](rust-lang/rust#137338)

</details>

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).

🚦 **Automerge**: Enabled.

♻ **Rebasing**: Whenever MR is behind base branch, or you tick the rebase/retry checkbox.

🔕 **Ignore**: Close this MR and you won't be reminded about this update again.

---

 - [ ] <!-- rebase-check -->If you want to rebase/retry this MR, check this box

---

This MR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOS4yMTIuMiIsInVwZGF0ZWRJblZlciI6IjM5LjIxMi4yIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJSZW5vdmF0ZSBCb3QiXX0=-->
bmwiedemann pushed a commit to bmwiedemann/openSUSE that referenced this pull request Mar 26, 2025
@bmwiedemann
Update rust1.85 to version 1.85.1 / rev 2 via SR 1255785
e5a8bff 
https://build.opensuse.org/request/show/1255785
by user xiaoguang_wang + anag+factory
Version 1.85.1 (2025-03-18)
==========================
- [Fix the doctest-merging feature of the 2024 Edition.](rust-lang/rust#137899)
- [Relax some `target_feature` checks when generating docs.](rust-lang/rust#137632)
- [Fix errors in `std::fs::rename` on Windows 10, version 1607.](rust-lang/rust#137528)
- [Downgrade bootstrap `cc` to fix custom targets.](rust-lang/rust#137460)
- [Skip submodule updates when building Rust from a source tarball.](rust-lang/rust#137338)
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers
No reviews
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. stable-accepted Accepted 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
Milestone
1.85.1
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
@onur-ozkan @rustbot @Kobzol @bors @cuviper