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

CI: fix CMake installation for 32/64 bit dist Linux #114053

Merged
merged 1 commit into from
Jul 27, 2023
Merged

CI: fix CMake installation for 32/64 bit dist Linux #114053

merged 1 commit into from
Jul 27, 2023

Conversation

Kobzol
Copy link
Contributor

@Kobzol Kobzol commented Jul 25, 2023

Should hopefully fix LLVM 17 build (#114048 (comment)).

@rustbot
Copy link
Collaborator

rustbot commented Jul 25, 2023

r? @pietroalbini

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

@rustbot rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. labels Jul 25, 2023
@Kobzol
Copy link
Contributor Author

Kobzol commented Jul 25, 2023

@bors try

@bors
Copy link
Contributor

bors commented Jul 25, 2023

⌛ Trying commit 934a60cecf7f6910d7e20cc61db37e907803eed9 with merge c8c872bd593ffd24db806fb556f0619bfd324e2f...

@klensy
Copy link
Contributor

klensy commented Jul 25, 2023

Feels like this should fail, as cmake required cmake to build itself, bootstraping required some additional steps (https://github.com/Kitware/CMake#building-cmake), but we'll see.

@Kobzol
Copy link
Contributor Author

Kobzol commented Jul 25, 2023

The previous version of the Dockerfile didn't seem to install CMake before running the CMake script, and the installation script itself doesn't seem to use cmake. We'll see.

@klensy
Copy link
Contributor

klensy commented Jul 25, 2023

In first versions you set prefix for cmake, but later removed 197390d

@Kobzol
Copy link
Contributor Author

Kobzol commented Jul 25, 2023

Ah, that's a good point. Still, I suppose that if cmake gets installed into the global directories (i.e. not into /rustroot, but into usr/bin), it should still be available. I don't think that we use an absolute path (like /rustroot/bin/cmake) anywhere.

@klensy
Copy link
Contributor

klensy commented Jul 25, 2023

Insert which cmake and cmake --version all around to assert which version actually used?

@Kobzol
Copy link
Contributor Author

Kobzol commented Jul 25, 2023

There should be just one cmake after the change in this PR, AFAIK (the one that we install). I removed the cmake coming from the package manager.

@bors
Copy link
Contributor

bors commented Jul 25, 2023

☀️ Try build successful - checks-actions
Build commit: c8c872bd593ffd24db806fb556f0619bfd324e2f (c8c872bd593ffd24db806fb556f0619bfd324e2f)

@klensy
Copy link
Contributor

klensy commented Jul 25, 2023

Success? https://github.com/rust-lang/rust/blob/master/src/ci/docker/host-x86_64/dist-i686-linux/Dockerfile too

@Kobzol
Copy link
Contributor Author

Kobzol commented Jul 25, 2023

Good point, thanks!

@Kobzol Kobzol changed the title CI: fix CMake installation for dist-x86_64-linux CI: fix CMake installation for 32/64 bit dist Linux Jul 25, 2023
@nikic
Copy link
Contributor

nikic commented Jul 26, 2023

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Jul 26, 2023

📌 Commit 6c4437e has been approved by nikic

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 Jul 26, 2023
@matthiaskrgr matthiaskrgr mentioned this pull request Jul 27, 2023
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 27, 2023
@bors
Auto merge of rust-lang#114116 - matthiaskrgr:rollup-dtdfk76, r=matth…
3e11b22 
…iaskrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#113872 (Tweak CGU sorting in a couple of places.)
 - rust-lang#114053 (CI: fix CMake installation for 32/64 bit `dist` Linux)
 - rust-lang#114075 (inline format!() args from rustc_codegen_llvm to the end (4))
 - rust-lang#114081 (`desugar_doc_comments` cleanups)
 - rust-lang#114082 (add stable NullaryOp)
 - rust-lang#114098 (replace atty crate with std's IsTerminal)
 - rust-lang#114102 (Dont pass `-Zwrite-long-types-to-disk=no` for `ui-fulldeps --stage=1`)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 14669cb into rust-lang:master Jul 27, 2023
11 checks passed
@rustbot rustbot added this to the 1.73.0 milestone Jul 27, 2023
@Kobzol Kobzol deleted the ci-linux-fix-cmake branch July 27, 2023 07:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@pietroalbini pietroalbini

Labels
A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.73.0
Development

Successfully merging this pull request may close these issues.
6 participants
@Kobzol @rustbot @bors @klensy @nikic @pietroalbini