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

enable download_ci_llvm test #131659

Merged
merged 1 commit into from
Oct 14, 2024
Merged

enable download_ci_llvm test #131659

merged 1 commit into from
Oct 14, 2024

Conversation

onur-ozkan
Copy link
Member

This was ignored because it caused merge failures on LLVM update PR. The issue was not checking is_ci_llvm_available in the test which is crucial for enabling CI LLVM:

rust/src/bootstrap/src/core/config/config.rs

Lines 2835 to 2844 in 2aa26d8

match download_ci_llvm {
StringOrBool::Bool(b) => {
if !b && self.download_rustc_commit.is_some() {
panic!(
"`llvm.download-ci-llvm` cannot be set to `false` if `rust.download-rustc` is set to `true` or `if-unchanged`."
);
}
// If download-ci-llvm=true we also want to check that CI llvm is available
b && llvm::is_ci_llvm_available(self, asserts)

@onur-ozkan
enable download_ci_llvm test
ac20242 
Signed-off-by: onur-ozkan <work@onurozkan.dev>
@rustbot
Copy link
Collaborator

rustbot commented Oct 13, 2024

r? @albertlarsan68

rustbot has assigned @albertlarsan68.
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
Copy link
Collaborator

rustbot commented Oct 13, 2024

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

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

@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 Oct 13, 2024
albertlarsan68
albertlarsan68 approved these changes Oct 13, 2024
View reviewed changes
Copy link
Member

@albertlarsan68 albertlarsan68 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@albertlarsan68
Copy link
Member

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Oct 13, 2024

📌 Commit ac20242 has been approved by albertlarsan68

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 Oct 13, 2024
@matthiaskrgr matthiaskrgr mentioned this pull request Oct 13, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 13, 2024
@bors
Auto merge of rust-lang#131662 - matthiaskrgr:rollup-r1wkfxw, r=matth…
47017dd 
…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#130356 (don't warn about a missing change-id in CI)
 - rust-lang#130900 (Do not output () on empty description)
 - rust-lang#131066 (Add the Chinese translation entry to the RustByExample build process)
 - rust-lang#131067 (Fix std_detect links)
 - rust-lang#131644 (Clean up some Miri things in `sys/windows`)
 - rust-lang#131646 (sys/unix: add comments for some Miri fallbacks)
 - rust-lang#131653 (Remove const trait bound modifier hack)
 - rust-lang#131659 (enable `download_ci_llvm` test)

r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 13, 2024
@bors
Auto merge of rust-lang#131662 - matthiaskrgr:rollup-r1wkfxw, r=matth…
5ceb623 
…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#130356 (don't warn about a missing change-id in CI)
 - rust-lang#130900 (Do not output () on empty description)
 - rust-lang#131066 (Add the Chinese translation entry to the RustByExample build process)
 - rust-lang#131067 (Fix std_detect links)
 - rust-lang#131644 (Clean up some Miri things in `sys/windows`)
 - rust-lang#131646 (sys/unix: add comments for some Miri fallbacks)
 - rust-lang#131653 (Remove const trait bound modifier hack)
 - rust-lang#131659 (enable `download_ci_llvm` test)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 0e00a70 into rust-lang:master Oct 14, 2024
6 checks passed
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Oct 14, 2024
@rust-timer
Unrolled build for rust-lang#131659
36337a7 
Rollup merge of rust-lang#131659 - onur-ozkan:llvm-test, r=albertlarsan68

enable `download_ci_llvm` test

This was ignored because it caused merge failures on [LLVM update PR](rust-lang#131448). The issue was not checking `is_ci_llvm_available` in the test which is crucial for enabling CI LLVM:

https://github.com/rust-lang/rust/blob/2aa26d8a722cf8810b27538c24b93d29324d4ac7/src/bootstrap/src/core/config/config.rs#L2835-L2844
@rustbot rustbot added this to the 1.83.0 milestone Oct 14, 2024
@onur-ozkan onur-ozkan deleted the llvm-test branch October 14, 2024 03:55
@cuviper cuviper modified the milestones: 1.83.0, 1.84.0 Oct 14, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@albertlarsan68 albertlarsan68 albertlarsan68 approved these changes

Assignees

@albertlarsan68 albertlarsan68

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
Milestone
1.84.0
Development

Successfully merging this pull request may close these issues.
5 participants
@onur-ozkan @rustbot @albertlarsan68 @bors @cuviper