Skip to content

Fix download-ci-llvm NixOS patching for .sos.#97041

Merged
bors merged 1 commit intorust-lang:masterfrom
eddyb:nixos-llvm-ci-patchelf
May 15, 2022
Merged

Fix download-ci-llvm NixOS patching for .sos.#97041
bors merged 1 commit intorust-lang:masterfrom
eddyb:nixos-llvm-ci-patchelf

Conversation

@eddyb
Copy link
Member

@eddyb eddyb commented May 14, 2022 •
edited
Loading

See #95170 (comment) - in short, Path::ends_with doesn't do the same thing as str::ends_with, and can only be used to check for whole file names, not extensions.

With this PR, I get the full suite of:

extracting /home/eddy/Projects/rust-A/build/cache/llvm-ebb80ec4e90f8622440f3e33562db0d6e6c66555-true/rust-dev-nightly-x86_64-unknown-linux-gnu.tar.xz to /home/eddy/Projects/rust-A/build/x86_64-unknown-linux-gnu/ci-llvm
info: you seem to be using Nix. Attempting to patch /home/eddy/Projects/rust-A/build/x86_64-unknown-linux-gnu/ci-llvm/bin/llvm-config
/nix/store/r4bzq2xilvv8fmqjg626hzwi22ah3hf4-rust-stage0-dependencies
info: you seem to be using Nix. Attempting to patch /home/eddy/Projects/rust-A/build/x86_64-unknown-linux-gnu/ci-llvm/bin/FileCheck
info: you seem to be using Nix. Attempting to patch /home/eddy/Projects/rust-A/build/x86_64-unknown-linux-gnu/ci-llvm/lib/libLLVM-14-rust-1.62.0-nightly.so

(that libLLVM-14-rust-1.62.0-nightly.so at the end having been missing before)

r? @Mark-Simulacrum cc @jyn514

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 14, 2022
@eddyb eddyb mentioned this pull request May 14, 2022
Merged
@est31 est31 mentioned this pull request May 14, 2022
Merged
@Mark-Simulacrum
Copy link
Member

Mark-Simulacrum commented May 14, 2022

@bors r+

Thanks! Not sure we test nix in CI today, unfortunately.

@bors
Copy link
Collaborator

bors commented May 14, 2022

📌 Commit f38555c 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 May 14, 2022
@eddyb eddyb mentioned this pull request May 14, 2022
Closed
@matthiaskrgr matthiaskrgr mentioned this pull request May 15, 2022
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request May 15, 2022
@bors
Auto merge of rust-lang#97055 - matthiaskrgr:rollup-1nqwfzx, r=matthi…
e1ec326 
…askrgr

Rollup of 3 pull requests

Successful merges:

 - rust-lang#96958 (Improve settings menu display and remove theme menu)
 - rust-lang#97032 (Allow the unused_macro_rules lint for now)
 - rust-lang#97041 (Fix `download-ci-llvm` NixOS patching for `.so`s.)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit a37ba96 into rust-lang:master May 15, 2022
@rustbot rustbot added this to the 1.63.0 milestone May 15, 2022
@eddyb eddyb deleted the nixos-llvm-ci-patchelf branch June 4, 2022 00:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@Mark-Simulacrum Mark-Simulacrum

Labels

S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Milestone

1.63.0

Development

Successfully merging this pull request may close these issues.

5 participants

@eddyb @Mark-Simulacrum @bors @rust-highfive @rustbot