Skip to content

Commit 0e6144d

Browse files
committed
Add llvm 18 and 19 as apt sources
This also installs gpg and wget in the aarch64 docker.
1 parent 60dc1c2 commit 0e6144d

File tree

3 files changed

+9
-2
lines changed

3 files changed

+9
-2
lines changed

.github/dockerfiles/Dockerfile_22.04-aarch64

+5
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,10 @@ RUN apt-get install --yes gcc-aarch64-linux-gnu g++-aarch64-linux-gnu
88
RUN apt-get install --yes python3 python3-pip
99
RUN pip install cmakelint colorama lit
1010
RUN apt-get install --yes spirv-tools
11+
RUN apt-get install --yes wget gpg
12+
RUN wget -qO - https://apt.llvm.org/llvm-snapshot.gpg.key | gpg --dearmor - | tee /usr/share/keyrings/llvm-archive-keyring.gpg >/dev/null
13+
RUN echo 'deb [signed-by=/usr/share/keyrings/llvm-archive-keyring.gpg] http://apt.llvm.org/jammy/ llvm-toolchain-jammy-18 main' | tee /etc/apt/sources.list.d/llvm.list >/dev/null
14+
RUN echo 'deb [signed-by=/usr/share/keyrings/llvm-archive-keyring.gpg] http://apt.llvm.org/jammy/ llvm-toolchain-jammy-19 main' | tee -a /etc/apt/sources.list.d/llvm.list >/dev/null
15+
1116
RUN apt-get install --yes zstd
1217
RUN apt-get -y install gh

.github/dockerfiles/Dockerfile_22.04-x86-64

+2-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@ RUN apt-get update
2222

2323
# Add clang-tidy
2424
RUN wget -qO - https://apt.llvm.org/llvm-snapshot.gpg.key | gpg --dearmor - | tee /usr/share/keyrings/llvm-archive-keyring.gpg >/dev/null
25-
RUN echo 'deb [signed-by=/usr/share/keyrings/llvm-archive-keyring.gpg] http://apt.llvm.org/jammy/ llvm-toolchain-jammy-19 main' | tee /etc/apt/sources.list.d/llvm.list >/dev/null
25+
RUN echo 'deb [signed-by=/usr/share/keyrings/llvm-archive-keyring.gpg] http://apt.llvm.org/jammy/ llvm-toolchain-jammy-18 main' | tee /etc/apt/sources.list.d/llvm.list >/dev/null
26+
RUN echo 'deb [signed-by=/usr/share/keyrings/llvm-archive-keyring.gpg] http://apt.llvm.org/jammy/ llvm-toolchain-jammy-19 main' | tee -a /etc/apt/sources.list.d/llvm.list >/dev/null
2627
RUN apt-get update
2728
RUN apt-get install --yes clang-tidy-19
2829

.github/dockerfiles/Dockerfile_24.04-x86-64

+2-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@ RUN apt-get update
2222

2323
# Add clang-tidy
2424
RUN wget -qO - https://apt.llvm.org/llvm-snapshot.gpg.key | gpg --dearmor - | tee /usr/share/keyrings/llvm-archive-keyring.gpg >/dev/null
25-
RUN echo 'deb [signed-by=/usr/share/keyrings/llvm-archive-keyring.gpg] http://apt.llvm.org/noble/ llvm-toolchain-noble-19 main' | tee /etc/apt/sources.list.d/llvm.list >/dev/null
25+
RUN echo 'deb [signed-by=/usr/share/keyrings/llvm-archive-keyring.gpg] http://apt.llvm.org/noble/ llvm-toolchain-noble-18 main' | tee /etc/apt/sources.list.d/llvm.list >/dev/null
26+
RUN echo 'deb [signed-by=/usr/share/keyrings/llvm-archive-keyring.gpg] http://apt.llvm.org/noble/ llvm-toolchain-noble-19 main' | tee -a /etc/apt/sources.list.d/llvm.list >/dev/null
2627
RUN apt-get update
2728
RUN apt-get install --yes clang-tidy-19
2829

0 commit comments

Comments
 (0)