Skip to content

Make the default stage for x.py configurable #76625

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

Merged
merged 1 commit into from
Sep 16, 2020

Conversation

jyn514
Copy link
Member

@jyn514 jyn514 commented Sep 12, 2020

This also allows configuring each sub-command individually.

Possibly #76617 should land before this? I don't feel strongly either way, I don't mind waiting.

Closes #76165.
r? @Mark-Simulacrum

@jyn514 jyn514 added the T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) label Sep 12, 2020
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 12, 2020
@jyn514 jyn514 mentioned this pull request Sep 12, 2020
@Mark-Simulacrum
Copy link
Member

Could you squash the commits here?

r=me with that done

This allows configuring the default stage for each sub-command individually.

- Normalize the stage as early as possible, so there's no confusion
  about which to use.
- Don't add an explicit `stage` option in config.toml

  This offers no more flexibility than `*_stage` and makes it confusing
  which takes precedence.

- Always give `--stage N` precedence over config.toml
- Fix bootstrap tests

  This changes the tests to go through `Config::parse` so that they test
  the actual defaults, not the dummy ones provided by `default_opts`.  To
  make this workable (and independent of the environment), it does not
  read `config.toml` for tests.
@jyn514
Copy link
Member Author

jyn514 commented Sep 15, 2020

@bors r=Mark-Simulacrum

@bors
Copy link
Collaborator

bors commented Sep 15, 2020

📌 Commit 328c61c has been approved by Mark-Simulacrum

@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 Sep 15, 2020
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Sep 16, 2020
…acrum

Make the default stage for x.py configurable

This also allows configuring each sub-command individually.

Possibly rust-lang#76617 should land before this? I don't feel strongly either way, I don't mind waiting.

Closes rust-lang#76165.
r? @Mark-Simulacrum
@bors
Copy link
Collaborator

bors commented Sep 16, 2020

⌛ Testing commit 328c61c with merge c93c3d91c8202c1111d06e5534c39b1859b3a91a...

@jyn514
Copy link
Member Author

jyn514 commented Sep 16, 2020

@bors retry yield

(#76774)

@bors
Copy link
Collaborator

bors commented Sep 16, 2020

⌛ Testing commit 328c61c with merge 1e11660...

@bors
Copy link
Collaborator

bors commented Sep 16, 2020

☀️ Test successful - checks-actions, checks-azure
Approved by: Mark-Simulacrum
Pushing 1e11660 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Sep 16, 2020
@bors bors merged commit 1e11660 into rust-lang:master Sep 16, 2020
@rustbot rustbot added this to the 1.48.0 milestone Sep 16, 2020
@jyn514 jyn514 deleted the default-stages branch September 16, 2020 16:56
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
merged-by-bors This PR was explicitly merged by bors. 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
Development

Successfully merging this pull request may close these issues.

Make the default stage for x.py configurable
6 participants