Skip to content

Commit 88cdc00

Browse files
committed
build(deps): update llvm from 14 to 19
1 parent 7cf38ff commit 88cdc00

File tree

3 files changed

+11
-13
lines changed

3 files changed

+11
-13
lines changed

Dockerfile

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,13 @@ RUN mkdir -p /etc/apt/keyrings && scurl https://deb.nodesource.com/gpgkey/nodeso
2121
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
2222
RUN apt-get update && apt-get install nodejs -y
2323

24-
# At the moment, we can use the LLVM version shipped by Debian bookworm. If we
25-
# need to diverge in the future we can update this layer to use an alternate apt
26-
# source. See https://apt.llvm.org/.
24+
# See https://apt.llvm.org/.
2725
FROM apt-base as apt-llvm
28-
# RUN DEBIAN_FRONTEND=noninteractive apt-get install -y gnupg2
29-
# RUN curl --tlsv1.2 -fsSL https://apt.llvm.org/llvm-snapshot.gpg.key |apt-key add -
30-
# RUN ( echo 'deb http://apt.llvm.org/bookworm/ llvm-toolchain-bookworm-14 main' \
31-
# && echo 'deb-src http://apt.llvm.org/bookworm/ llvm-toolchain-bookworm-14 main' ) >> /etc/apt/sources.list
32-
# RUN DEBIAN_FRONTEND=noninteractive apt-get update
26+
RUN DEBIAN_FRONTEND=noninteractive apt-get install -y gnupg2
27+
RUN curl --tlsv1.2 -fsSL https://apt.llvm.org/llvm-snapshot.gpg.key |apt-key add -
28+
RUN ( echo 'deb http://apt.llvm.org/bookworm/ llvm-toolchain-bookworm-19 main' \
29+
&& echo 'deb-src http://apt.llvm.org/bookworm/ llvm-toolchain-bookworm-19 main' ) >> /etc/apt/sources.list
30+
RUN DEBIAN_FRONTEND=noninteractive apt-get update
3331

3432
##
3533
## Scripting tools
@@ -380,9 +378,9 @@ RUN --mount=type=cache,from=apt-base,source=/etc/apt,target=/etc/apt,ro \
380378
RUN --mount=type=cache,from=apt-llvm,source=/etc/apt,target=/etc/apt,ro \
381379
--mount=type=cache,from=apt-llvm,source=/var/cache/apt,target=/var/cache/apt,sharing=locked \
382380
--mount=type=cache,from=apt-llvm,source=/var/lib/apt/lists,target=/var/lib/apt/lists,sharing=locked \
383-
DEBIAN_FRONTEND=noninteractive apt-get install -y clang-14 llvm-14
384-
ENV CC=clang-14 \
385-
CXX=clang++-14
381+
DEBIAN_FRONTEND=noninteractive apt-get install -y clang-19 llvm-19
382+
ENV CC=clang-19 \
383+
CXX=clang++-19
386384

387385
# Use microsoft's Docker setup script to install the Docker CLI.
388386
#

actions/setup-rust/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ runs:
2929
) >> "$GITHUB_ENV"
3030
3131
- shell: bash
32-
run: curl --tlsv1.2 -sSfL https://apt.llvm.org/llvm.sh | sudo bash -s 14
32+
run: curl --tlsv1.2 -sSfL https://apt.llvm.org/llvm.sh | sudo bash -s 19
3333

3434
- if: inputs.components
3535
shell: bash

bin/just-cargo

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ export RUSTFLAGS := env_var_or_default("RUSTFLAGS", "-D warnings") + if target =
2424
' --codegen linker=arm-linux-gnueabihf-gcc'
2525
} else { '' }
2626

27-
_llvm-version := '14'
27+
_llvm-version := '19'
2828
_clang := 'clang-' + _llvm-version
2929
_strip := 'llvm-strip-' + _llvm-version
3030
_ar := 'llvm-ar-' + _llvm-version

0 commit comments

Comments
 (0)