|
1 | 1 | # If you change this, also change the llvm repo below.
|
2 |
| -FROM ubuntu:20.04 |
| 2 | +FROM ubuntu:22.04 |
3 | 3 |
|
4 | 4 | ARG DEBIAN_FRONTEND=noninteractive
|
5 | 5 |
|
@@ -37,12 +37,12 @@ RUN gem install --no-document fpm
|
37 | 37 | ##############################
|
38 | 38 | # llvm (needed because some rust crates compile C code). See https://apt.llvm.org/.
|
39 | 39 | RUN wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add -
|
40 |
| -RUN add-apt-repository 'deb http://apt.llvm.org/focal llvm-toolchain-focal-16 main' |
| 40 | +RUN add-apt-repository 'deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-18 main' |
41 | 41 | RUN apt-get update -y && apt-get install -y --no-install-recommends \
|
42 |
| - llvm-16 \ |
43 |
| - clang-16 |
44 |
| -RUN update-alternatives --install /usr/bin/clang clang /usr/bin/clang-16 100 |
45 |
| -RUN update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-16 100 |
| 42 | + llvm-18 \ |
| 43 | + clang-18 |
| 44 | +RUN update-alternatives --install /usr/bin/clang clang /usr/bin/clang-18 100 |
| 45 | +RUN update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-18 100 |
46 | 46 |
|
47 | 47 |
|
48 | 48 | ##############################
|
@@ -76,7 +76,7 @@ RUN cd /opt/osxcross && UNATTENDED=yes OSX_VERSION_MIN=10.16 ./build.sh
|
76 | 76 | # Rust compiler
|
77 | 77 | ENV PATH /opt/cargo/bin:$PATH
|
78 | 78 | ENV RUSTUP_HOME=/opt/rustup
|
79 |
| -RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | CARGO_HOME=/opt/cargo sh -s -- --profile minimal --default-toolchain 1.69.0 -y |
| 79 | +RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | CARGO_HOME=/opt/cargo sh -s -- --profile minimal --default-toolchain 1.79.0 -y |
80 | 80 | RUN rustup target add x86_64-pc-windows-gnu
|
81 | 81 | RUN rustup target add x86_64-apple-darwin
|
82 | 82 | RUN rustup target add aarch64-apple-darwin
|
|
0 commit comments