From 64b3492c30eaa3a963ed87a3c306f2cb29baa5b5 Mon Sep 17 00:00:00 2001 From: Jakub Beránek Date: Sat, 29 Jun 2024 13:51:50 +0200 Subject: Rename Rust for Linux CI job to make its name clearer --- src/ci/docker/host-x86_64/rfl/Dockerfile | 40 ---------------------- .../host-x86_64/x86_64-rust-for-linux/Dockerfile | 40 ++++++++++++++++++++++ 2 files changed, 40 insertions(+), 40 deletions(-) delete mode 100644 src/ci/docker/host-x86_64/rfl/Dockerfile create mode 100644 src/ci/docker/host-x86_64/x86_64-rust-for-linux/Dockerfile (limited to 'src/ci/docker') diff --git a/src/ci/docker/host-x86_64/rfl/Dockerfile b/src/ci/docker/host-x86_64/rfl/Dockerfile deleted file mode 100644 index 97298519cf2..00000000000 --- a/src/ci/docker/host-x86_64/rfl/Dockerfile +++ /dev/null @@ -1,40 +0,0 @@ -FROM ubuntu:22.04 - -ARG DEBIAN_FRONTEND=noninteractive - -# libclang1 is required for libclang.so, required by bindgen -# clang, llvm and lld is required by RfL to compile host code -RUN apt-get update && apt-get install -y --no-install-recommends \ - g++ \ - make \ - ninja-build \ - file \ - curl \ - ca-certificates \ - python3 \ - git \ - cmake \ - flex \ - bison \ - bc \ - clang-15 \ - libclang1-15 \ - llvm-15 \ - lld-15 \ - libelf-dev \ - libedit-dev \ - libssl-dev \ - pkg-config \ - zlib1g-dev \ - && rm -rf /var/lib/apt/lists/* - -COPY scripts/sccache.sh /scripts/ -RUN sh /scripts/sccache.sh - -# RfL needs access to cland, lld and llvm tools -ENV PATH="${PATH}:/usr/lib/llvm-15/bin" - -ENV RUST_CONFIGURE_ARGS --build=x86_64-unknown-linux-gnu - -COPY /scripts/rfl-build.sh /tmp/rfl-build.sh -ENV SCRIPT bash /tmp/rfl-build.sh diff --git a/src/ci/docker/host-x86_64/x86_64-rust-for-linux/Dockerfile b/src/ci/docker/host-x86_64/x86_64-rust-for-linux/Dockerfile new file mode 100644 index 00000000000..97298519cf2 --- /dev/null +++ b/src/ci/docker/host-x86_64/x86_64-rust-for-linux/Dockerfile @@ -0,0 +1,40 @@ +FROM ubuntu:22.04 + +ARG DEBIAN_FRONTEND=noninteractive + +# libclang1 is required for libclang.so, required by bindgen +# clang, llvm and lld is required by RfL to compile host code +RUN apt-get update && apt-get install -y --no-install-recommends \ + g++ \ + make \ + ninja-build \ + file \ + curl \ + ca-certificates \ + python3 \ + git \ + cmake \ + flex \ + bison \ + bc \ + clang-15 \ + libclang1-15 \ + llvm-15 \ + lld-15 \ + libelf-dev \ + libedit-dev \ + libssl-dev \ + pkg-config \ + zlib1g-dev \ + && rm -rf /var/lib/apt/lists/* + +COPY scripts/sccache.sh /scripts/ +RUN sh /scripts/sccache.sh + +# RfL needs access to cland, lld and llvm tools +ENV PATH="${PATH}:/usr/lib/llvm-15/bin" + +ENV RUST_CONFIGURE_ARGS --build=x86_64-unknown-linux-gnu + +COPY /scripts/rfl-build.sh /tmp/rfl-build.sh +ENV SCRIPT bash /tmp/rfl-build.sh -- cgit 1.4.1-3-g733a5