File tree Expand file tree Collapse file tree 4 files changed +63
-0
lines changed Expand file tree Collapse file tree 4 files changed +63
-0
lines changed Original file line number Diff line number Diff line change @@ -286,6 +286,10 @@ jobs:
286286 - name : x86_64-gnu-distcheck
287287 os : ubuntu-20.04-8core-32gb
288288 env : {}
289+ - name : x86_64-gnu-llvm-17
290+ env :
291+ RUST_BACKTRACE : 1
292+ os : ubuntu-20.04-8core-32gb
289293 - name : x86_64-gnu-llvm-16
290294 env :
291295 RUST_BACKTRACE : 1
Original file line number Diff line number Diff line change @@ -38,6 +38,10 @@ RUN sh /scripts/sccache.sh
3838# LLVM, rather than the typical src/llvm-project LLVM.
3939ENV NO_DOWNLOAD_CI_LLVM 1
4040
41+ # This is not the latest LLVM version, so some components required by tests may
42+ # be missing.
43+ ENV IS_NOT_LATEST_LLVM 1
44+
4145# Using llvm-link-shared due to libffi issues -- see #34486
4246ENV RUST_CONFIGURE_ARGS \
4347 --build=x86_64-unknown-linux-gnu \
Original file line number Diff line number Diff line change 1+ FROM ubuntu:23.10
2+
3+ ARG DEBIAN_FRONTEND=noninteractive
4+
5+ RUN apt-get update && apt-get install -y --no-install-recommends \
6+ g++ \
7+ gcc-multilib \
8+ make \
9+ ninja-build \
10+ file \
11+ curl \
12+ ca-certificates \
13+ python3 \
14+ git \
15+ cmake \
16+ sudo \
17+ gdb \
18+ llvm-17-tools \
19+ llvm-17-dev \
20+ libedit-dev \
21+ libssl-dev \
22+ pkg-config \
23+ zlib1g-dev \
24+ xz-utils \
25+ nodejs \
26+ mingw-w64 \
27+ && rm -rf /var/lib/apt/lists/*
28+
29+ # Install powershell (universal package) so we can test x.ps1 on Linux
30+ RUN curl -sL "https://github.com/PowerShell/PowerShell/releases/download/v7.3.1/powershell_7.3.1-1.deb_amd64.deb" > powershell.deb && \
31+ dpkg -i powershell.deb && \
32+ rm -f powershell.deb
33+
34+ COPY scripts/sccache.sh /scripts/
35+ RUN sh /scripts/sccache.sh
36+
37+ # We are disabling CI LLVM since this builder is intentionally using a host
38+ # LLVM, rather than the typical src/llvm-project LLVM.
39+ ENV NO_DOWNLOAD_CI_LLVM 1
40+
41+ # Using llvm-link-shared due to libffi issues -- see #34486
42+ ENV RUST_CONFIGURE_ARGS \
43+ --build=x86_64-unknown-linux-gnu \
44+ --llvm-root=/usr/lib/llvm-17 \
45+ --enable-llvm-link-shared \
46+ --set rust.thin-lto-import-instr-limit=10
47+
48+ COPY host-x86_64/x86_64-gnu-llvm-15/script.sh /tmp/
49+
50+ ENV SCRIPT /tmp/script.sh
Original file line number Diff line number Diff line change @@ -463,6 +463,11 @@ jobs:
463463 - name : x86_64-gnu-distcheck
464464 << : *job-linux-8c
465465
466+ - name : x86_64-gnu-llvm-17
467+ env :
468+ RUST_BACKTRACE : 1
469+ << : *job-linux-8c
470+
466471 - name : x86_64-gnu-llvm-16
467472 env :
468473 RUST_BACKTRACE : 1
You can’t perform that action at this time.
0 commit comments