diff --git a/Dockerfile b/Dockerfile index d6199eb..13fe9fc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,15 +21,13 @@ RUN mkdir -p /etc/apt/keyrings && scurl https://deb.nodesource.com/gpgkey/nodeso RUN echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" >/etc/apt/sources.list.d/nodesource.list RUN apt-get update && apt-get install nodejs -y -# At the moment, we can use the LLVM version shipped by Debian bookworm. If we -# need to diverge in the future we can update this layer to use an alternate apt -# source. See https://apt.llvm.org/. +# See https://apt.llvm.org/. FROM apt-base as apt-llvm -# RUN DEBIAN_FRONTEND=noninteractive apt-get install -y gnupg2 -# RUN curl --tlsv1.2 -fsSL https://apt.llvm.org/llvm-snapshot.gpg.key |apt-key add - -# RUN ( echo 'deb http://apt.llvm.org/bookworm/ llvm-toolchain-bookworm-14 main' \ -# && echo 'deb-src http://apt.llvm.org/bookworm/ llvm-toolchain-bookworm-14 main' ) >> /etc/apt/sources.list -# RUN DEBIAN_FRONTEND=noninteractive apt-get update +RUN DEBIAN_FRONTEND=noninteractive apt-get install -y gnupg2 +RUN curl --tlsv1.2 -fsSL https://apt.llvm.org/llvm-snapshot.gpg.key |apt-key add - +RUN ( echo 'deb http://apt.llvm.org/bookworm/ llvm-toolchain-bookworm-19 main' \ + && echo 'deb-src http://apt.llvm.org/bookworm/ llvm-toolchain-bookworm-19 main' ) >> /etc/apt/sources.list +RUN DEBIAN_FRONTEND=noninteractive apt-get update ## ## Scripting tools @@ -380,9 +378,9 @@ RUN --mount=type=cache,from=apt-base,source=/etc/apt,target=/etc/apt,ro \ RUN --mount=type=cache,from=apt-llvm,source=/etc/apt,target=/etc/apt,ro \ --mount=type=cache,from=apt-llvm,source=/var/cache/apt,target=/var/cache/apt,sharing=locked \ --mount=type=cache,from=apt-llvm,source=/var/lib/apt/lists,target=/var/lib/apt/lists,sharing=locked \ - DEBIAN_FRONTEND=noninteractive apt-get install -y clang-14 llvm-14 -ENV CC=clang-14 \ - CXX=clang++-14 + DEBIAN_FRONTEND=noninteractive apt-get install -y clang-19 llvm-19 +ENV CC=clang-19 \ + CXX=clang++-19 # Use microsoft's Docker setup script to install the Docker CLI. # diff --git a/actions/setup-rust/action.yml b/actions/setup-rust/action.yml index e7d5ef1..e624a47 100644 --- a/actions/setup-rust/action.yml +++ b/actions/setup-rust/action.yml @@ -29,7 +29,7 @@ runs: ) >> "$GITHUB_ENV" - shell: bash - run: curl --tlsv1.2 -sSfL https://apt.llvm.org/llvm.sh | sudo bash -s 14 + run: curl --tlsv1.2 -sSfL https://apt.llvm.org/llvm.sh | sudo bash -s 19 - if: inputs.components shell: bash diff --git a/bin/just-cargo b/bin/just-cargo index 47ffbe0..6f6afd7 100755 --- a/bin/just-cargo +++ b/bin/just-cargo @@ -24,7 +24,7 @@ export RUSTFLAGS := env_var_or_default("RUSTFLAGS", "-D warnings") + if target = ' --codegen linker=arm-linux-gnueabihf-gcc' } else { '' } -_llvm-version := '14' +_llvm-version := '19' _clang := 'clang-' + _llvm-version _strip := 'llvm-strip-' + _llvm-version _ar := 'llvm-ar-' + _llvm-version