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

ci: update ubuntu:20.04 builders to 22.04 #113931

Merged
merged 13 commits into from
Jul 28, 2023
Merged

Conversation

cuviper
Copy link
Member

@cuviper cuviper commented Jul 21, 2023

This is mostly just maintenance to avoid bitrotting, but 22.04 also updates to cmake 3.22, so they don't need the manual builds from #113714 anymore.

@rustbot
Copy link
Collaborator

rustbot commented Jul 21, 2023

r? @Mark-Simulacrum

(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 21, 2023
@Kobzol Kobzol mentioned this pull request Jul 25, 2023
1 task
This is consistent with what we had from `arm-linux-gnueabihf-gcc` in
the `ubuntu:20.04` base.
@Mark-Simulacrum
Copy link
Member

@bors r+ rollup=never

Nothing here looks too suspicious...

@bors
Copy link
Contributor

bors commented Jul 28, 2023

📌 Commit 3cd3a91 has been approved by Mark-Simulacrum

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 28, 2023
@bors
Copy link
Contributor

bors commented Jul 28, 2023

⌛ Testing commit 3cd3a91 with merge b6dd153...

@Kobzol
Copy link
Contributor

Kobzol commented Jul 28, 2023

I think that the bump from 20.04 to 22.04 updates the glibc version. Do we care about this for some of the modified dist builders? Or is this only relevant for x64 Linux gnu?

@cuviper
Copy link
Member Author

cuviper commented Jul 28, 2023

Hmm, I suppose it is relevant to any *-linux-gnu that uses the Ubuntu cross compilers, but it doesn't matter as much for those that don't provide host tools. So dist-powerpc64le-linux is a host but not using the Ubuntu toolchain; dist-various-1 and -2 have a few linux-gnu that are non-host, using Ubuntu's toolchain.

Do we care about libstd.so glibc versions on those? (libstd.rlib should be fine.)

@cuviper
Copy link
Member Author

cuviper commented Jul 28, 2023

If we do care, maybe we could fork those linux-gnu targets into a dist-various-3 or something, that explicitly holds back on ubuntu:20.04. Long term, it would be better to use crosstool-ng toolchains when we want to control glibc versions.

@Mark-Simulacrum
Copy link
Member

Can you check against https://doc.rust-lang.org/beta/rustc/platform-support.html? I think if we don't document a version we should be fine to bump as a nonevent, otherwise let's bump the documentation at least. (My quick scroll suggests it's not unlikely this doesn't change anything, but I'm not sure)

@matthiaskrgr
Copy link
Member

Hmm, dist-x86_64-musl is running for 2.5 hours already, hopefully that is just a one-off 😓

@bors
Copy link
Contributor

bors commented Jul 28, 2023

☀️ Test successful - checks-actions
Approved by: Mark-Simulacrum
Pushing b6dd153 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 28, 2023
@bors bors merged commit b6dd153 into rust-lang:master Jul 28, 2023
11 checks passed
@rustbot rustbot added this to the 1.73.0 milestone Jul 28, 2023
@cuviper
Copy link
Member Author

cuviper commented Jul 28, 2023

Can you check against https://doc.rust-lang.org/beta/rustc/platform-support.html? I think if we don't document a version we should be fine to bump as a nonevent, otherwise let's bump the documentation at least.

The glibc versions under Tier 2 (without host) should be updated, but they're already wrong. They should have been updated for #81521 at least, and there's a deja vu comment about compat and dynamic linking... 😅

I'll send an update, including a footnote about that applicability.

cuviper added a commit to cuviper/rust that referenced this pull request Jul 28, 2023
These Tier 2 non-host targets were affected by the update to
`ubuntu:22.04` in rust-lang#113931, but the platform support page was already out
of date after rust-lang#81521 updated to `ubuntu:20.04`. They are now listed for
kernel 5.15 and glibc 2.35 as found in 22.04, and a new footnote
mentions that this only matters when using the dynamic `libstd.so`.
@cuviper
Copy link
Member Author

cuviper commented Jul 29, 2023

Hmm, dist-x86_64-musl is running for 2.5 hours already, hopefully that is just a one-off 😓

LLVM alone took over 1.5 hours in that build, but only 5 minutes in the next -- hooray for sccache!

@rust-timer
Copy link
Collaborator

Finished benchmarking commit (b6dd153): comparison URL.

Overall result: ✅ improvements - no action needed

@rustbot label: -perf-regression

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-0.6% [-0.8%, -0.3%] 3
All ❌✅ (primary) - - 0

Max RSS (memory usage)

This benchmark run did not return any relevant results for this metric.

Cycles

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
3.3% [1.0%, 6.3%] 8
Regressions ❌
(secondary)
2.1% [2.1%, 2.1%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 3.3% [1.0%, 6.3%] 8

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 650.027s -> 649.861s (-0.03%)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-testsuite Area: The testsuite used to check the correctness of rustc 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. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants