Skip to content

Conversation

onur-ozkan
Copy link
Contributor

@onur-ozkan onur-ozkan commented Oct 9, 2024

We can't use CI rustc while using in-tree LLVM (which happens in LLVM submodule update PRs) and this PR handles that by ignoring CI-rustc in CI and failing in non-CI environments.

@rustbot
Copy link
Collaborator

rustbot commented Oct 9, 2024

r? @Kobzol

rustbot has assigned @Kobzol.
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 9, 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 9, 2024
@onur-ozkan
Copy link
Contributor Author

Tested and it's fixed #131448 (comment) in #131455.

@onur-ozkan onur-ozkan force-pushed the llvm-ci-check-for-rustc-ci branch from 2d13cda to 77e3225 Compare October 10, 2024 05:22
@onur-ozkan onur-ozkan changed the title turn off download-rustc if LLVM submodule has changes disable download-rustc if LLVM submodule has changes in CI Oct 10, 2024
@onur-ozkan onur-ozkan force-pushed the llvm-ci-check-for-rustc-ci branch 2 times, most recently from 04e7cec to 30c5080 Compare October 10, 2024 05:54
@onur-ozkan onur-ozkan force-pushed the llvm-ci-check-for-rustc-ci branch from 30c5080 to b198a46 Compare October 10, 2024 05:55
@Kobzol
Copy link
Member

Kobzol commented Oct 10, 2024

Looks reasonable. As usually, I would like to move this logic outside of Config parsing, but that can happen later (once I can finally get to is, sigh..).

@bors r+

@bors
Copy link
Collaborator

bors commented Oct 10, 2024

📌 Commit b198a46 has been approved by Kobzol

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 10, 2024
@bors
Copy link
Collaborator

bors commented Oct 10, 2024

⌛ Testing commit b198a46 with merge de19f2b...

@bors
Copy link
Collaborator

bors commented Oct 10, 2024

☀️ Test successful - checks-actions
Approved by: Kobzol
Pushing de19f2b to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 10, 2024
@bors bors merged commit de19f2b into rust-lang:master Oct 10, 2024
7 checks passed
@rustbot rustbot added this to the 1.83.0 milestone Oct 10, 2024
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (de19f2b): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results (secondary 2.2%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
2.2% [2.2%, 2.2%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) - - 0

Cycles

This benchmark run did not return any relevant results for this metric.

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 774.605s -> 775.399s (0.10%)
Artifact size: 329.57 MiB -> 329.69 MiB (0.03%)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in 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.

5 participants