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

Package more llvm-* tools in the rust-dev component, for run-make-fulldeps tests #78131

Merged
merged 2 commits into from
Oct 22, 2020

Conversation

SimonSapin
Copy link
Contributor

Fixes #78110

@rust-highfive
Copy link
Collaborator

r? @Mark-Simulacrum

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 20, 2020
@SimonSapin
Copy link
Contributor Author

I’ll test this as suggested in #78110 (comment)

@bors try

@bors
Copy link
Contributor

bors commented Oct 20, 2020

⌛ Trying commit 8eb523bad6effc063f62ccf2fcaec9434d28d555 with merge 5c20da84f57ee6d76fe23ee7aa6d4bc18f4dda00...

@bors
Copy link
Contributor

bors commented Oct 20, 2020

☀️ Try build successful - checks-actions, checks-azure
Build commit: 5c20da84f57ee6d76fe23ee7aa6d4bc18f4dda00 (5c20da84f57ee6d76fe23ee7aa6d4bc18f4dda00)

@SimonSapin SimonSapin changed the title Package llvm-ar binary in the rust-dev component Package more llvm-* tools in the rust-dev component, for run-make-fulldeps tests Oct 20, 2020
@SimonSapin
Copy link
Contributor Author

With some more tools…

@bors try

@bors
Copy link
Contributor

bors commented Oct 20, 2020

⌛ Trying commit bc3dbc6 with merge 32bf523d699eabd43c5fef0b23bb5792884074be...

@bors
Copy link
Contributor

bors commented Oct 20, 2020

☀️ Try build successful - checks-actions, checks-azure
Build commit: 32bf523d699eabd43c5fef0b23bb5792884074be (32bf523d699eabd43c5fef0b23bb5792884074be)

@SimonSapin
Copy link
Contributor Author

Alright, ./x.py test src/test/run-make-fulldeps now suceeds with download-ci-llvm = "if-available" if I hard-code this try build instead of this:

llvm_sha = subprocess.check_output([
"git", "log", "--author=bors", "--format=%H", "-n1",
"-m", "--first-parent",
"--", "src/llvm-project"
]).decode(sys.getdefaultencoding()).strip()

But if we land this PR as-is, that logic will still pick the last bors commit that touched the LLVM submodule which for now is before this PR and so does not have the extra tools.

@Mark-Simulacrum
Copy link
Member

Hm, I wonder if we should just add a stamp file somewhere and check that as well in the list - I feel like that's the right call here. Would you be up for doing that?

@SimonSapin
Copy link
Contributor Author

Sure, what would be a good location?

@Mark-Simulacrum
Copy link
Member

Let's put it in src/bootstrap/llvm-submodule-stamp. (But I don't care strongly).

@SimonSapin
Copy link
Contributor Author

I believe this is ready for review and landing

@Mark-Simulacrum
Copy link
Member

@bors r+ rollup=never

@bors
Copy link
Contributor

bors commented Oct 20, 2020

📌 Commit 99f99ca has been approved by Mark-Simulacrum

@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 20, 2020
@camelid camelid added the A-LLVM Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues. label Oct 20, 2020
@bors
Copy link
Contributor

bors commented Oct 22, 2020

⌛ Testing commit 99f99ca with merge 8f0fa9d...

@bors
Copy link
Contributor

bors commented Oct 22, 2020

☀️ Test successful - checks-actions, checks-azure
Approved by: Mark-Simulacrum
Pushing 8f0fa9d to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 22, 2020
@bors bors merged commit 8f0fa9d into rust-lang:master Oct 22, 2020
@rustbot rustbot added this to the 1.49.0 milestone Oct 22, 2020
@SimonSapin SimonSapin deleted the ar branch October 22, 2020 11:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-LLVM Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues. 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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

"llvm-ar: No such file or directory" in run-make-fulldeps tests with download-ci-llvm
6 participants