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 or patch Docker images #4120

Merged
merged 6 commits into from
Nov 20, 2024
Merged

Conversation

tgross35
Copy link
Contributor

@tgross35 tgross35 commented Nov 20, 2024

Take 2 at #4119: upgrade 64-bit Docker to 24:10, but just enable using the old repos on 32-bit so we don't need to worry about the time_t change right away.

This is done because Ubuntu cut off the EOL repos.

@rustbot
Copy link
Collaborator

rustbot commented Nov 20, 2024

r? @JohnTitor

rustbot has assigned @JohnTitor.
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 A-CI Area: CI-related items labels Nov 20, 2024
@tgross35 tgross35 force-pushed the docker-fixes branch 4 times, most recently from 5c0792c to 0e8d8d2 Compare November 20, 2024 07:17
`ctest` sometimes reports a parsing failure but it isn't consistent (I
do not know why). Just use a less ideal older syntax for now, this is an
internal macro.
Since 6ab46bb ("ci: Use some tricks..."), `rustfmt` is invoked
manually on all files in `src`. However, this stopped running `cargo
fmt` which covered everything that wasn't in `src`.

This was unintentional so add it back.
23.10 is EOL so update to the latest stable version. This change
excludes sparc which is stuck on an older version.
Recent versions of glibc adjusted the fields in `statvfs`. Update tests
to ignore the differences.
@tgross35 tgross35 added the stable-nominated This PR should be considered for cherry-pick to libc's stable release branch label Nov 20, 2024
tgross35 added a commit to tgross35/rust-libc that referenced this pull request Nov 20, 2024
`ctest` sometimes reports a parsing failure but it isn't consistent (I
do not know why). Just use a less ideal older syntax for now, this is an
internal macro.

(backport <rust-lang#4120>)
(cherry picked from commit 27ad994)
tgross35 added a commit to tgross35/rust-libc that referenced this pull request Nov 20, 2024
Since 6ab46bb ("ci: Use some tricks..."), `rustfmt` is invoked
manually on all files in `src`. However, this stopped running `cargo
fmt` which covered everything that wasn't in `src`.

This was unintentional so add it back.

(backport <rust-lang#4120>)
(cherry picked from commit 96b6ec2)
tgross35 added a commit to tgross35/rust-libc that referenced this pull request Nov 20, 2024
23.10 is EOL so update to the latest stable version. This change
excludes sparc which is stuck on an older version.

(backport <rust-lang#4120>)
(cherry picked from commit 0c9abef)
tgross35 added a commit to tgross35/rust-libc that referenced this pull request Nov 20, 2024
tgross35 added a commit to tgross35/rust-libc that referenced this pull request Nov 20, 2024
Recent versions of glibc adjusted the fields in `statvfs`. Update tests
to ignore the differences.

(backport <rust-lang#4120>)
(cherry picked from commit 2d206ec)
tgross35 added a commit to tgross35/rust-libc that referenced this pull request Nov 20, 2024
@tgross35 tgross35 added this pull request to the merge queue Nov 20, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Nov 20, 2024
@tgross35 tgross35 added this pull request to the merge queue Nov 20, 2024
Merged via the queue into rust-lang:main with commit cffbad3 Nov 20, 2024
45 checks passed
@tgross35 tgross35 mentioned this pull request Nov 20, 2024
3 tasks
@tgross35 tgross35 deleted the docker-fixes branch November 20, 2024 09:08
@tgross35 tgross35 added stable-applied This PR has been cherry-picked to libc's stable release branch and removed stable-nominated This PR should be considered for cherry-pick to libc's stable release branch labels Nov 20, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-CI Area: CI-related items S-waiting-on-review stable-applied This PR has been cherry-picked to libc's stable release branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants