Skip to content

Commit b3f8586

Browse files
committed
Auto merge of #147581 - Zalathar:coreutils-from-gnu, r=Kobzol
ci: Use GNU coreutils to work around a libffi-sys build failure This is an attempt to work around the CI failures at #147556, by switching back to GNU coreutils (instead of uutils) on the Ubuntu 25.10 jobs. - [Zulip thread](https://rust-lang.zulipchat.com/#narrow/channel/242791-t-infra/topic/Treeclosed.3A.20libffi.20failures/with/544301779)
2 parents 9725c4b + 7f0adce commit b3f8586

File tree

3 files changed

+6
-0
lines changed

3 files changed

+6
-0
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ 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 \
57
g++ \
68
make \
79
ninja-build \

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ 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 \
68
bzip2 \
79
g++ \
810
make \

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ 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 \
57
g++ \
68
make \
79
ninja-build \

0 commit comments

Comments
 (0)