Skip to content

Commit 843f8ce

Browse files
committed
Auto merge of #147798 - Zalathar:uutils, r=jieyouxu
ci: Switch back to default coreutils (uutils) after libffi-sys bump Now that Miri has updated to the latest `libffi-sys`, we should be able to remove the GNU coreutils workaround, and switch back to the default coreutils (uutils) in the runners using Ubuntu 25.10 images. If we encounter any other uutils compatibility problems in the future, they should hopefully be easier to trace back to specific changes. - #147581 - rust-lang/miri#4634 - #147744 Closes #147556.
2 parents 9606412 + 439431a commit 843f8ce

File tree

3 files changed

+0
-6
lines changed

3 files changed

+0
-6
lines changed

src/ci/docker/host-aarch64/aarch64-gnu-debug/Dockerfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ FROM ubuntu:25.10
22

33
ARG DEBIAN_FRONTEND=noninteractive
44
RUN apt-get update && apt-get install -y --no-install-recommends \
5-
# FIXME(#147556): Use GNU coreutils to work around a libffi-sys build failure.
6-
coreutils-from-gnu coreutils-from-uutils- --allow-remove-essential \
75
g++ \
86
make \
97
ninja-build \

src/ci/docker/host-aarch64/aarch64-gnu-llvm-20/Dockerfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ FROM ubuntu:25.10
33
ARG DEBIAN_FRONTEND=noninteractive
44

55
RUN apt-get update && apt-get install -y --no-install-recommends \
6-
# FIXME(#147556): Use GNU coreutils to work around a libffi-sys build failure.
7-
coreutils-from-gnu coreutils-from-uutils- --allow-remove-essential \
86
bzip2 \
97
g++ \
108
make \

src/ci/docker/host-aarch64/aarch64-gnu/Dockerfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ FROM ubuntu:25.10
22

33
ARG DEBIAN_FRONTEND=noninteractive
44
RUN apt-get update && apt-get install -y --no-install-recommends \
5-
# FIXME(#147556): Use GNU coreutils to work around a libffi-sys build failure.
6-
coreutils-from-gnu coreutils-from-uutils- --allow-remove-essential \
75
g++ \
86
make \
97
ninja-build \

0 commit comments

Comments
 (0)