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

Add Profile Override for Non-Git Sources #135433

Merged
merged 1 commit into from
Jan 20, 2025
Merged

Add Profile Override for Non-Git Sources #135433

merged 1 commit into from
Jan 20, 2025
+7 −4

Conversation

tanvincible
Copy link
Contributor

@tanvincible tanvincible commented Jan 13, 2025 •
edited
Loading

PR description

This PR introduces the following updates to

  1. bootstrap.py:

    • If the profile is None and the source is non-git, the profile is automatically overridden to "dist".
    • Ensures that options like download-ci-llvm and download-rustc are not used with non-git sources. An exception is raised if these options are present in the configuration when the source is non-git.

  2. bootstrap_test.py

    • Added unit tests to verify both the profile override mechanism and the assertion for restricted options.
      These tests ensure the correct behavior for non-git sources and the handling of if-unchanged options.

r? @onur-ozkan
@rustbot T-bootstrap

@rustbot
Copy link
Collaborator

rustbot commented Jan 13, 2025

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @onur-ozkan (or someone else) some time within the next two weeks.

Please see the contribution instructions for more information. Namely, in order to ensure the minimum review times lag, PR authors and assigned reviewers should ensure that the review label (S-waiting-on-review and S-waiting-on-author) stays updated, invoking these commands when appropriate:

  • @rustbot author: the review is finished, PR author should check the comments and take action accordingly
  • @rustbot review: the author is ready for a review, this PR will be queued again in the reviewer's queue

@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) has-merge-commits PR has merge commits, merge with caution. S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jan 13, 2025
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@onur-ozkan
Copy link
Member

Thank you for your effort!

I will be available for the review around this weekend. In the meantime please ensure the CI is green and there are no arbitrary commits (e.g., merge commit) in the PR. You may wanna check out the guideline for doing that.

@onur-ozkan onur-ozkan removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 13, 2025
@tanvincible tanvincible marked this pull request as draft January 13, 2025 14:11
@rustbot rustbot added A-compiletest Area: The compiletest test runner A-rustc-dev-guide Area: rustc-dev-guide A-testsuite Area: The testsuite used to check the correctness of rustc labels Jan 13, 2025
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@tanvincible
Copy link
Contributor Author

tanvincible commented Jan 13, 2025 •
edited
Loading

@rustbot label -A-compiletest, -A-rustc-dev-guide, -A-testsuite

@tanvincible tanvincible changed the title Add Profile Override for Non-Git Sources and Assert Restrictions on if-unchanged Options Add Profile Override for Non-Git Sources Jan 13, 2025
@rustbot rustbot removed A-compiletest Area: The compiletest test runner A-rustc-dev-guide Area: rustc-dev-guide A-testsuite Area: The testsuite used to check the correctness of rustc labels Jan 13, 2025
@tanvincible
Copy link
Contributor Author

@rustbot label -has-merge-commits

@rustbot rustbot removed the has-merge-commits PR has merge commits, merge with caution. label Jan 13, 2025
@tanvincible tanvincible force-pushed the patch-1 branch 2 times, most recently from f0692f4 to 46454a2 Compare January 19, 2025 18:14
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@onur-ozkan onur-ozkan marked this pull request as ready for review January 20, 2025 07:27
@rustbot
Copy link
Collaborator

rustbot commented Jan 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.

@onur-ozkan
Copy link
Member

Thank you!

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Jan 20, 2025

📌 Commit 7d80617 has been approved by onur-ozkan

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jan 20, 2025
@jieyouxu jieyouxu mentioned this pull request Jan 20, 2025
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 20, 2025
@bors
Auto merge of rust-lang#135769 - jieyouxu:rollup-3h384pz, r=jieyouxu
9f4d9dc 
Rollup of 5 pull requests

Successful merges:

 - rust-lang#135433 (Add Profile Override for Non-Git Sources)
 - rust-lang#135626 (doc: Point to methods on `Command` as alternatives to `set/remove_var`)
 - rust-lang#135658 (Do not include GCC source code in source tarballs)
 - rust-lang#135676 (rustc_resolve: use structured fields in traces)
 - rust-lang#135762 (Correct counting to four in cell module docs)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit bdd88dd into rust-lang:master Jan 20, 2025
6 checks passed
@rustbot rustbot added this to the 1.86.0 milestone Jan 20, 2025
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Jan 20, 2025
@rust-timer
Unrolled build for rust-lang#135433
d42a936 
Rollup merge of rust-lang#135433 - tanvincible:patch-1, r=onur-ozkan

Add Profile Override for Non-Git Sources

## PR description

- Fixes rust-lang#135358

This PR introduces the following updates to

1. `bootstrap.py`:
    - If the `profile` is `None` and the source is non-git, the `profile` is automatically overridden to `"dist"`.
    - Ensures that options like `download-ci-llvm` and `download-rustc` are not used with non-git sources. An exception is raised if these options are present in the configuration when the source is non-git.

2. `bootstrap_test.py`
   - Added unit tests to verify both the profile override mechanism and the assertion for restricted options.
These tests ensure the correct behavior for non-git sources and the handling of `if-unchanged` options.

r? `@onur-ozkan`
`@rustbot` T-bootstrap
@onur-ozkan
Copy link
Member

@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 Jan 21, 2025
@tanvincible tanvincible deleted the patch-1 branch January 21, 2025 06:47
@onur-ozkan
Copy link
Member

@rustbot label +stable-accepted +beta-accepted

(see the Zulip thread)

@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 Jan 21, 2025
@cuviper cuviper mentioned this pull request Jan 24, 2025
Merged
@cuviper cuviper modified the milestones: 1.86.0, 1.85.0 Jan 24, 2025
@cuviper cuviper removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Jan 24, 2025
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 24, 2025
@bors
Auto merge of rust-lang#136017 - cuviper:beta-next, r=cuviper
750a870 
[beta] backports

- Always force non-trimming of path in `unreachable_patterns` lint rust-lang#135310
- Add Profile Override for Non-Git Sources rust-lang#135433
- resolve symlinks of LLVM tool binaries before copying them rust-lang#135585
- add cache to `AmbiguityCausesVisitor` rust-lang#135618
- When LLVM's location discriminator value limit is exceeded, emit locations with dummy spans instead of dropping them entirely rust-lang#135643
- Temporarily bring back `Rvalue::Len` rust-lang#135709
- make it possible to use ci-rustc on tarball sources rust-lang#135722
- Remove test panic from File::open rust-lang#135837
- Only assert the `Parser` size on specific arches rust-lang#135855

r? cuviper
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 25, 2025
@bors
Auto merge of rust-lang#136017 - cuviper:beta-next, r=cuviper
3816a38 
[beta] backports

- Always force non-trimming of path in `unreachable_patterns` lint rust-lang#135310
- Add Profile Override for Non-Git Sources rust-lang#135433
- resolve symlinks of LLVM tool binaries before copying them rust-lang#135585
- add cache to `AmbiguityCausesVisitor` rust-lang#135618
- When LLVM's location discriminator value limit is exceeded, emit locations with dummy spans instead of dropping them entirely rust-lang#135643
- Temporarily bring back `Rvalue::Len` rust-lang#135709
- make it possible to use ci-rustc on tarball sources rust-lang#135722
- Remove test panic from File::open rust-lang#135837
- Only assert the `Parser` size on specific arches rust-lang#135855
- [beta] TRPL: more backward-compatible Edition changes rust-lang#135843

r? cuviper
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 26, 2025
@bors
Auto merge of rust-lang#136017 - cuviper:beta-next, r=cuviper
14445aa 
[beta] backports

- Always force non-trimming of path in `unreachable_patterns` lint rust-lang#135310
- Add Profile Override for Non-Git Sources rust-lang#135433
- resolve symlinks of LLVM tool binaries before copying them rust-lang#135585
- add cache to `AmbiguityCausesVisitor` rust-lang#135618
- When LLVM's location discriminator value limit is exceeded, emit locations with dummy spans instead of dropping them entirely rust-lang#135643
- make it possible to use ci-rustc on tarball sources rust-lang#135722
- Remove test panic from File::open rust-lang#135837
- Only assert the `Parser` size on specific arches rust-lang#135855
- [beta] TRPL: more backward-compatible Edition changes rust-lang#135843

r? cuviper
@cuviper cuviper mentioned this pull request Jan 27, 2025
Open
@cuviper cuviper modified the milestones: 1.85.0, 1.84.1 Jan 27, 2025
@cuviper cuviper removed the stable-nominated Nominated for backporting to the compiler in the stable channel. label Jan 27, 2025
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 27, 2025
@bors
Auto merge of rust-lang#136158 - cuviper:stable-next, r=cuviper
e71f9a9 
[stable] Prepare Rust 1.84.1 point release

- [Fix ICE 132920 in duplicate-crate diagnostics.](rust-lang#133304)
- [Fix errors for overlapping impls in incremental rebuilds.](rust-lang#133828)
- [Fix slow compilation related to the next-generation trait solver.](rust-lang#135618)
- [Fix debuginfo when LLVM's location discriminator value limit is exceeded.](rust-lang#135643)
- Fixes for building Rust from source:
  - [Only try to distribute `llvm-objcopy` if llvm tools are enabled.](rust-lang#134240)
  - [Add Profile Override for Non-Git Sources.](rust-lang#135433)
  - [Resolve symlinks of LLVM tool binaries before copying them.](rust-lang#135585)
  - [Make it possible to use ci-rustc on tarball sources.](rust-lang#135722)

cc `@rust-lang/release`
r? ghost
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@onur-ozkan onur-ozkan onur-ozkan left review comments

Assignees

@onur-ozkan onur-ozkan

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.84.1
Development

Successfully merging this pull request may close these issues.

Building rustc-1.84.0 tarball fails with git error "fatal: --local can only be used inside a git repository"
6 participants
@tanvincible @rustbot @rust-log-analyzer @onur-ozkan @bors @cuviper