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

set rust.channel properly in source tarballs #125181

Merged
merged 1 commit into from
May 17, 2024

Conversation

onur-ozkan
Copy link
Member

This change sets the appropriate channel by default when using nightly, beta or stable source tarballs.

Fixes #124618

@rustbot
Copy link
Collaborator

rustbot commented May 16, 2024

r? @clubby789

rustbot has assigned @clubby789.
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 May 16, 2024
@rustbot
Copy link
Collaborator

rustbot commented May 16, 2024

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

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

@clubby789
Copy link
Contributor

@bors r+ rollup

@bors
Copy link
Contributor

bors commented May 16, 2024

📌 Commit 33574e7 has been approved by clubby789

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 May 16, 2024
@rust-log-analyzer

This comment has been minimized.

@onur-ozkan onur-ozkan force-pushed the set-rust-channel-properly branch from 33574e7 to f55ef48 Compare May 16, 2024 15:30
@rust-log-analyzer

This comment has been minimized.

@onur-ozkan onur-ozkan force-pushed the set-rust-channel-properly branch from f55ef48 to e9c8273 Compare May 16, 2024 15:36
This change sets the appropriate channel by default when using nightly,
beta or stable source tarballs.

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

@bors r=clubby789

@bors
Copy link
Contributor

bors commented May 16, 2024

📌 Commit e9c8273 has been approved by clubby789

It is now in the queue for this repository.

bors added a commit to rust-lang-ci/rust that referenced this pull request May 17, 2024
…iaskrgr

Rollup of 5 pull requests

Successful merges:

 - rust-lang#123694 (expand: fix minor diagnostics bug)
 - rust-lang#125171 (Rename `flatten(_mut)` → `as_flattened(_mut)`)
 - rust-lang#125181 (set `rust.channel` properly in source tarballs)
 - rust-lang#125186 (Remove duplicate word from addr docs)
 - rust-lang#125191 (Report better WF obligation leaf obligations in new solver)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 52de709 into rust-lang:master May 17, 2024
6 checks passed
@rustbot rustbot added this to the 1.80.0 milestone May 17, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request May 17, 2024
Rollup merge of rust-lang#125181 - onur-ozkan:set-rust-channel-properly, r=clubby789

set `rust.channel` properly in source tarballs

This change sets the appropriate channel by default when using nightly, beta or stable source tarballs.

Fixes rust-lang#124618
@onur-ozkan onur-ozkan deleted the set-rust-channel-properly branch May 17, 2024 09:13
bherrera pushed a commit to misttech/integration that referenced this pull request Oct 16, 2024
Here are all the changes. I went through them one-by-one and confirmed
that they should not be affecting us. In paritcular, we explicitly set
rust.lld = false (because we want to use the lld that ships with clang),
so the change in default does not affect us.

There have been changes to x.py since you last updated:
  [INFO] New option `build.lldb` that will override the default lldb binary path used in debuginfo tests
    - PR Link rust-lang/rust#124501
  [INFO] The compiler profile now defaults to rust.debuginfo-level = "line-tables-only"
    - PR Link rust-lang/rust#123337
  [WARNING] `rust.lld` has a new default value of `true` on `x86_64-unknown-linux-gnu`. Starting at stage1, `rust-lld` will thus be this target's default linker. No config changes should be necessary.
    - PR Link rust-lang/rust#124129
  [WARNING] Removed `dist.missing-tools` configuration as it was deprecated long time ago.
    - PR Link rust-lang/rust#125535
  [WARNING] `llvm.lld` is enabled by default for the dist profile. If set to false, `lld` will not be included in the dist build.
    - PR Link rust-lang/rust#126701
  [WARNING] `debug-logging` option has been removed from the default `tools` profile.
    - PR Link rust-lang/rust#127913
  [INFO] the `wasm-component-ld` tool is now built as part of `build.extended` and can be a member of `build.tools`
    - PR Link rust-lang/rust#127866
  [INFO] Removed android-ndk r25b support in favor of android-ndk r26d.
    - PR Link rust-lang/rust#120593
  [WARNING] For tarball sources, default value for `rust.channel` will be taken from `src/ci/channel` file.
    - PR Link rust-lang/rust#125181
  [INFO] New option `llvm.libzstd` to control whether llvm is built with zstd support.
    - PR Link rust-lang/rust#125642
  [WARNING] ./x test --rustc-args was renamed to --compiletest-rustc-args as it only applies there. ./x miri --rustc-args was also removed.
    - PR Link rust-lang/rust#128841
  [INFO] The `build.profiler` option now tries to use source code from `download-ci-llvm` if possible, instead of checking out the `src/llvm-project` submodule.
    - PR Link rust-lang/rust#129295

Original-Reviewed-on: https://fuchsia-review.googlesource.com/c/infra/recipes/+/1120078
Original-Revision: 27df37a30e50b14b9ffefc872b6997790f03d4ea
GitOrigin-RevId: 341e222f002e36886b9960645b21faeaed633f90
Change-Id: Id1eb54a677a6f538bf7666d65b85d5fdba17ea42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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.

rustc built from a source tarball reports it's nightly
5 participants