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

bump download-ci-llvm-stamp #130162

Merged
merged 1 commit into from
Sep 10, 2024
Merged

bump download-ci-llvm-stamp #130162

merged 1 commit into from
Sep 10, 2024
+1 −1

Conversation

onur-ozkan
Copy link
Member

This should trigger the download and extraction of the ci-llvm tarball, which should resolve #130144.

@onur-ozkan
bump download-ci-llvm-stamp
667cf22 
Signed-off-by: onur-ozkan <work@onurozkan.dev>
@rustbot
Copy link
Collaborator

rustbot commented Sep 9, 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 Sep 9, 2024
@Kobzol
Copy link
Contributor

Kobzol commented Sep 9, 2024 •
edited
Loading

I switched to 085744b, extracted ci-llvm, switched to 263a3ae, ran ./x build, got the error. Then I applied this commit, but the error is still there :/ Would it behave differently if the change was committed on master?

@onur-ozkan
Copy link
Member Author

Would it behave differently if the change was committed on master?

Yes. We look for the merge (bors) commit here

rust/src/bootstrap/src/core/build_steps/llvm.rs

Lines 156 to 159 in 38e3a57

helpers::get_closest_merge_base_commit(
Some(&config.src),
&config.git_config(),
&config.stage0_metadata.config.git_merge_commit_email,

If you patch that logic you should be able to test it properly.

@Kobzol
Copy link
Contributor

Kobzol commented Sep 9, 2024

I see, thanks!

@bors r+

@bors
Copy link
Contributor

bors commented Sep 9, 2024

📌 Commit 667cf22 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 Sep 9, 2024
workingjubilee added a commit to workingjubilee/rustc that referenced this pull request Sep 10, 2024
@workingjubilee
Rollup merge of rust-lang#130162 - onur-ozkan:bump-ci-llvm-stamp, r=K…
0ee8a56 
…obzol

bump download-ci-llvm-stamp

This should trigger the download and extraction of the ci-llvm tarball, which should resolve rust-lang#130144.
@workingjubilee workingjubilee mentioned this pull request Sep 10, 2024
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 10, 2024
@bors
Auto merge of rust-lang#130177 - workingjubilee:rollup-m4r01yn, r=wor…
2cf47e4 
…kingjubilee

Rollup of 14 pull requests

Successful merges:

 - rust-lang#128316 (Stabilize most of `io_error_more`)
 - rust-lang#129473 (use  `download-ci-llvm=true` in the default compiler config)
 - rust-lang#129529 (Add test to build crates used by r-a on stable)
 - rust-lang#129778 (interpret: make typed copies lossy wrt provenance and padding)
 - rust-lang#129981 (Remove `serialized_bitcode` from `LtoModuleCodegen`.)
 - rust-lang#130025 (Also emit `missing_docs` lint with `--test` to fulfil expectations)
 - rust-lang#130040 (unify `llvm-bitcode-linker`, `wasm-component-ld` and llvm-tools logics)
 - rust-lang#130094 (Inform the solver if evaluation is concurrent)
 - rust-lang#130132 ([illumos] enable SIGSEGV handler to detect stack overflows)
 - rust-lang#130146 (bootstrap `naked_asm!` for `compiler-builtins`)
 - rust-lang#130149 (Helper function for formatting with `LifetimeSuggestionPosition`)
 - rust-lang#130152 (adapt a test for llvm 20)
 - rust-lang#130162 (bump download-ci-llvm-stamp)
 - rust-lang#130164 (move some const fn out of the const_ptr_as_ref feature)

r? `@ghost`
`@rustbot` modify labels: rollup
@workingjubilee workingjubilee mentioned this pull request Sep 10, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 10, 2024
@bors
Auto merge of rust-lang#130179 - workingjubilee:rollup-l78cv44, r=wor…
0d1946d 
…kingjubilee

Rollup of 11 pull requests

Successful merges:

 - rust-lang#128316 (Stabilize most of `io_error_more`)
 - rust-lang#129473 (use  `download-ci-llvm=true` in the default compiler config)
 - rust-lang#129529 (Add test to build crates used by r-a on stable)
 - rust-lang#129981 (Remove `serialized_bitcode` from `LtoModuleCodegen`.)
 - rust-lang#130094 (Inform the solver if evaluation is concurrent)
 - rust-lang#130132 ([illumos] enable SIGSEGV handler to detect stack overflows)
 - rust-lang#130146 (bootstrap `naked_asm!` for `compiler-builtins`)
 - rust-lang#130149 (Helper function for formatting with `LifetimeSuggestionPosition`)
 - rust-lang#130152 (adapt a test for llvm 20)
 - rust-lang#130162 (bump download-ci-llvm-stamp)
 - rust-lang#130164 (move some const fn out of the const_ptr_as_ref feature)

r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 10, 2024
@bors
Auto merge of rust-lang#130179 - workingjubilee:rollup-l78cv44, r=wor…
26b2b8d 
…kingjubilee

Rollup of 11 pull requests

Successful merges:

 - rust-lang#128316 (Stabilize most of `io_error_more`)
 - rust-lang#129473 (use  `download-ci-llvm=true` in the default compiler config)
 - rust-lang#129529 (Add test to build crates used by r-a on stable)
 - rust-lang#129981 (Remove `serialized_bitcode` from `LtoModuleCodegen`.)
 - rust-lang#130094 (Inform the solver if evaluation is concurrent)
 - rust-lang#130132 ([illumos] enable SIGSEGV handler to detect stack overflows)
 - rust-lang#130146 (bootstrap `naked_asm!` for `compiler-builtins`)
 - rust-lang#130149 (Helper function for formatting with `LifetimeSuggestionPosition`)
 - rust-lang#130152 (adapt a test for llvm 20)
 - rust-lang#130162 (bump download-ci-llvm-stamp)
 - rust-lang#130164 (move some const fn out of the const_ptr_as_ref feature)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit ca3f4ae into rust-lang:master Sep 10, 2024
6 checks passed
@rustbot rustbot added this to the 1.83.0 milestone Sep 10, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Sep 10, 2024
@rust-timer
Unrolled build for rust-lang#130162
9f63ac6 
Rollup merge of rust-lang#130162 - onur-ozkan:bump-ci-llvm-stamp, r=Kobzol

bump download-ci-llvm-stamp

This should trigger the download and extraction of the ci-llvm tarball, which should resolve rust-lang#130144.
@onur-ozkan onur-ozkan deleted the bump-ci-llvm-stamp branch September 10, 2024 10:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
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.83.0
Development

Successfully merging this pull request may close these issues.

All x.py commands fail in bootstrap: cannot find file "ci-llvm/builder-config"
5 participants
@onur-ozkan @rustbot @Kobzol @bors @albertlarsan68