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 download-ci-llvm = "if-available" by default when channel = dev #104512

Merged
merged 1 commit into from
Dec 10, 2022

Conversation

jyn514
Copy link
Member

@jyn514 jyn514 commented Nov 17, 2022

See rust-lang/compiler-team#566. The motivation for changing the default is to avoid downloading and building LLVM when someone runs x build before running x setup. The motivation for only doing it on channel = "dev" is to avoid breaking distros or users installing from source. It works because dev is also the default channel.

The diff looks larger than it is; most of it is moving the llvm branch below the rust so config.channel is set.

r? @Mark-Simulacrum cc @oli-obk @bjorn3 @cuviper

@rustbot rustbot added T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Nov 17, 2022
@jyn514
Copy link
Member Author

jyn514 commented Nov 17, 2022

For future work, another thing we could do is change the default profile to user when the channel is anything other than dev; but I'm not adding that here because it needs more design (for one thing, we'd need a way to opt-out).

@jyn514 jyn514 force-pushed the download-ci-llvm-default branch 3 times, most recently from 1f8bd19 to 574cccc Compare November 17, 2022 04:54
@rust-log-analyzer

This comment has been minimized.

…ev"`

See rust-lang/compiler-team#566.
The motivation for changing the default is to avoid downloading and building LLVM when someone runs `x build` before running `x setup`.
The motivation for only doing it on `channel = "dev"` is to avoid breaking distros or users installing from source. It works because `dev` is also the default channel.

The diff looks larger than it is; most of it is moving the `llvm` branch below the `rust` so `config.channel` is set.
@Mark-Simulacrum
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Dec 8, 2022

📌 Commit ac67262 has been approved by Mark-Simulacrum

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 Dec 8, 2022
@bors
Copy link
Contributor

bors commented Dec 8, 2022

⌛ Testing commit ac67262 with merge 4a913d5df06ed53fb3d32fcc1c42fe00acbcfc6a...

@bors
Copy link
Contributor

bors commented Dec 8, 2022

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Dec 8, 2022
@jyn514
Copy link
Member Author

jyn514 commented Dec 8, 2022

Cloning into 'rust-toolstate'...
[master 53e8221] (linux CI update)
 1 file changed, 1 insertion(+)
remote: Invalid username or password.
fatal: Authentication failed for 'https://github.com/rust-lang-nursery/rust-toolstate/'

Unrelated to this PR, looks like https://rust-lang.zulipchat.com/#narrow/stream/242791-t-infra/topic/Authentication.20failed.20on.20merge.20attempt

@bors retry

@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 Dec 8, 2022
@rust-log-analyzer
Copy link
Collaborator

The job x86_64-gnu-tools failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)
 * branch            master     -> FETCH_HEAD
HEAD is now at 496fb40 (windows CI update)
[master 0c3bad5] (linux CI update)
 1 file changed, 1 insertion(+)
fatal: could not read Username for 'https://github.com': No such device or address
Sleeping for 3 seconds before retrying push
 * branch            master     -> FETCH_HEAD
HEAD is now at 496fb40 (windows CI update)
[master f695733] (linux CI update)
 1 file changed, 1 insertion(+)
 1 file changed, 1 insertion(+)
fatal: could not read Username for 'https://github.com': No such device or address
Sleeping for 3 seconds before retrying push
 * branch            master     -> FETCH_HEAD
HEAD is now at 496fb40 (windows CI update)
[master e9dafae] (linux CI update)
 1 file changed, 1 insertion(+)
 1 file changed, 1 insertion(+)
fatal: could not read Username for 'https://github.com': No such device or address
Sleeping for 3 seconds before retrying push
 * branch            master     -> FETCH_HEAD
HEAD is now at 496fb40 (windows CI update)
[master e4ca701] (linux CI update)
 1 file changed, 1 insertion(+)
 1 file changed, 1 insertion(+)
fatal: could not read Username for 'https://github.com': No such device or address
Sleeping for 3 seconds before retrying push
 * branch            master     -> FETCH_HEAD
 * branch            master     -> FETCH_HEAD
thread 'main' panicked at 'Failed to update toolstate repository with new data', toolstate.rs:436:9
HEAD is now at 496fb40 (windows CI update)
Build completed unsuccessfully in 0:00:17

bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 10, 2022
…iaskrgr

Rollup of 10 pull requests

Successful merges:

 - rust-lang#98391 (Reimplement std's thread parker on top of events on SGX)
 - rust-lang#104019 (Compute generator sizes with `-Zprint_type_sizes`)
 - rust-lang#104512 (Set `download-ci-llvm = "if-available"` by default when `channel = dev`)
 - rust-lang#104901 (Implement masking in FileType comparison on Unix)
 - rust-lang#105082 (Fix Async Generator ABI)
 - rust-lang#105109 (Add LLVM KCFI support to the Rust compiler)
 - rust-lang#105505 (Don't warn about unused parens when they are used by yeet expr)
 - rust-lang#105514 (Introduce `Span::is_visible`)
 - rust-lang#105516 (Update cargo)
 - rust-lang#105522 (Remove wrong note for short circuiting operators)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 1ce18d2 into rust-lang:master Dec 10, 2022
@rustbot rustbot added this to the 1.68.0 milestone Dec 10, 2022
@jyn514 jyn514 deleted the download-ci-llvm-default branch December 14, 2022 12:43
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.

5 participants