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

fetch submodule before checking llvm stamp #122632

Merged
merged 2 commits into from Apr 16, 2024
Merged

fetch submodule before checking llvm stamp #122632

merged 2 commits into from Apr 16, 2024

Conversation

onur-ozkan
Copy link
Member

@onur-ozkan onur-ozkan commented Mar 17, 2024 •
edited

Previously, we were checking the LLVM stamp before fetching the submodule which leads to not being able to compile llvm on submodule updates.

Fixes #122612
Fixes #122787

@rustbot
Copy link
Collaborator

rustbot commented Mar 17, 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 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 Mar 17, 2024
@rustbot
Copy link
Collaborator

rustbot commented Mar 17, 2024

This PR changes how LLVM is built. Consider updating src/bootstrap/download-ci-llvm-stamp.

@albertlarsan68
Copy link
Member

How does this interact with download-ci-llvm ?

@onur-ozkan
fetch submodule before checking llvm stamp
b75e6b4 
Previously, we were checking the LLVM stamp before fetching the submodule
which leads to not being able to compile llvm on submodule updates.

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

How does this interact with download-ci-llvm ?

Right, that was a mistake. Now it should work correctly. Thanks!

@petrochenkov
Copy link
Contributor

This logic may be related to the LLVM downloading issue (#122787) as well, because I noticed that LLVM is built from source only on the first build attempt, after that it is correctly downloaded from CI.

@onur-ozkan
Copy link
Member Author

This logic may be related to the LLVM downloading issue (#122787) as well, because I noticed that LLVM is built from source only on the first build attempt, after that it is correctly downloaded from CI.

I think this PR won't fix that problem as we fetch submodule after the download attempt.

@onur-ozkan
create Build::update_existing_submodule and use for llvm
3683b11 
Signed-off-by: onur-ozkan <work@onurozkan.dev>
@onur-ozkan
Copy link
Member Author

With 3683b11 changes #122787 should be fixed too.

@petrochenkov It would be nice if you can confirm that.

@albertlarsan68
Copy link
Member

Thanks for the PR!
@bors r+

@bors
Copy link
Contributor

bors commented Apr 16, 2024

📌 Commit 3683b11 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 Apr 16, 2024
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Apr 16, 2024
@matthiaskrgr
Rollup merge of rust-lang#122632 - onur-ozkan:fix-llvm-caching-bug, r…
04a2e3c 
…=albertlarsan68

fetch submodule before checking llvm stamp

Previously, we were checking the LLVM stamp before fetching the submodule which leads to not being able to compile llvm on submodule updates.

Fixes rust-lang#122612
Fixes rust-lang#122787
This was referenced Apr 16, 2024
Closed
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 16, 2024
@bors
Auto merge of rust-lang#124026 - matthiaskrgr:rollup-an6s6gq, r=matth…
468f115 
…iaskrgr

Rollup of 10 pull requests

Successful merges:

 - rust-lang#122632 (fetch submodule before checking llvm stamp)
 - rust-lang#123355 (Support type '/' to search)
 - rust-lang#123501 (Stabilize checking of cfgs at compile-time: `--check-cfg` option)
 - rust-lang#123535 (Match ergonomics 2024: `mut` doesn't reset binding mode)
 - rust-lang#123711 (drop `changelog-seen`)
 - rust-lang#123969 (The new solver ignores `DefineOpaqueTypes`, so switch it to `Yes`)
 - rust-lang#124007 (Miri subtree update)
 - rust-lang#124017 (Change a diagnostics-path-only `DefineOpaqueTypes` to `Yes`.)
 - rust-lang#124018 (interpret: pass MemoryKind to before_memory_deallocation)
 - rust-lang#124024 (interpret: remove outdated comment)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 592b1ca into rust-lang:master Apr 16, 2024
11 checks passed
@rustbot rustbot added this to the 1.79.0 milestone Apr 16, 2024
@onur-ozkan onur-ozkan deleted the fix-llvm-caching-bug branch April 16, 2024 19:41
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Apr 16, 2024
@rust-timer
Unrolled build for rust-lang#122632
b19896a 
Rollup merge of rust-lang#122632 - onur-ozkan:fix-llvm-caching-bug, r=albertlarsan68

fetch submodule before checking llvm stamp

Previously, we were checking the LLVM stamp before fetching the submodule which leads to not being able to compile llvm on submodule updates.

Fixes rust-lang#122612
Fixes rust-lang#122787
@onur-ozkan onur-ozkan mentioned this pull request Apr 22, 2024
Closed
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.79.0
5 participants
@onur-ozkan @rustbot @albertlarsan68 @petrochenkov @bors