Skip to content

Commit ffe83da

Browse files
elmarcoPatchew Applier
authored andcommitted
WIP: tests/docker: add rust to debian-legacy-test-cross
Unfortunately, debian 11 has bindgen version 0.55... Should we install it with cargo install bindgen-cli? Signed-off-by: Marc-André Lureau <[email protected]> Message-Id: <[email protected]>
1 parent 4b7f1f2 commit ffe83da

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

.gitlab-ci.d/buildtest.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,7 @@ build-legacy:
389389
variables:
390390
IMAGE: debian-legacy-test-cross
391391
TARGETS: alpha-linux-user alpha-softmmu sh4-linux-user mips-linux-user mips-softmmu mipsel-linux-user mipsel-softmmu mips64-linux-user mips64-softmmu
392-
CONFIGURE_ARGS: --disable-tools
392+
CONFIGURE_ARGS: --disable-tools --enable-rust
393393
MAKE_CHECK_ARGS: check-tcg
394394

395395
build-user-hexagon:

tests/docker/dockerfiles/debian-legacy-test-cross.docker

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
2525
RUN DEBIAN_FRONTEND=noninteractive eatmydata \
2626
apt install -y --no-install-recommends \
2727
bison \
28+
cargo \
2829
ccache \
2930
clang \
3031
flex \
@@ -41,9 +42,12 @@ RUN DEBIAN_FRONTEND=noninteractive eatmydata \
4142
python3-pip \
4243
python3-setuptools \
4344
python3-venv \
44-
python3-wheel && \
45+
python3-wheel \
46+
rustc-web \
47+
&& \
4548
dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt
4649

50+
RUN cargo install bindgen-cli
4751
RUN /usr/bin/pip3 install tomli
4852

4953
ENV QEMU_CONFIGURE_OPTS --disable-system --disable-docs --disable-tools

0 commit comments

Comments
 (0)