Skip to content

Commit

Permalink
Disable LLVM version 19 install while apt.llvm.org is broken. (#12)
Browse files Browse the repository at this point in the history
See logs here:
https://github.com/iree-org/base-docker-images/actions/runs/10948538407/job/30399779213

Upstream tracking issue:
llvm/llvm-project#109276

We need a recent LLVM compiler in our ASan/TSan workflows, so those
should stay pinned to older images until we can re-enable this install.
  • Loading branch information
ScottTodd authored Sep 19, 2024
1 parent e924bdd commit 14d8f4a
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 10 deletions.
11 changes: 6 additions & 5 deletions dockerfiles/cpubuilder_ubuntu_jammy_ghr_x86_64.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,14 @@ RUN apt update && \
gcc-9 g++-9 \
ninja-build libssl-dev libxml2-dev libcapstone-dev libtbb-dev \
libzstd-dev llvm-dev pkg-config
# TODO: re-enable this when LLVM apt packages are working again
# Recent compiler tools for build configurations like ASan/TSan.
# * See https://apt.llvm.org/ for context on the apt commands.
ARG LLVM_VERSION=19
RUN echo "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-${LLVM_VERSION} main" >> /etc/apt/sources.list && \
curl https://apt.llvm.org/llvm-snapshot.gpg.key | gpg --dearmor > /etc/apt/trusted.gpg.d/llvm-snapshot.gpg && \
apt update && \
apt install -y clang-${LLVM_VERSION} lld-${LLVM_VERSION}
# ARG LLVM_VERSION=19
# RUN echo "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-${LLVM_VERSION} main" >> /etc/apt/sources.list && \
# curl https://apt.llvm.org/llvm-snapshot.gpg.key | gpg --dearmor > /etc/apt/trusted.gpg.d/llvm-snapshot.gpg && \
# apt update && \
# apt install -y clang-${LLVM_VERSION} lld-${LLVM_VERSION}
# Cleanup.
RUN apt clean && rm -rf /var/lib/apt/lists/*

Expand Down
11 changes: 6 additions & 5 deletions dockerfiles/cpubuilder_ubuntu_jammy_x86_64.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,14 @@ RUN apt update && \
gcc-9 g++-9 \
ninja-build libssl-dev libxml2-dev libcapstone-dev libtbb-dev \
libzstd-dev llvm-dev pkg-config
# TODO: re-enable this when LLVM apt packages are working again
# Recent compiler tools for build configurations like ASan/TSan.
# * See https://apt.llvm.org/ for context on the apt commands.
ARG LLVM_VERSION=19
RUN echo "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-${LLVM_VERSION} main" >> /etc/apt/sources.list && \
curl https://apt.llvm.org/llvm-snapshot.gpg.key | gpg --dearmor > /etc/apt/trusted.gpg.d/llvm-snapshot.gpg && \
apt update && \
apt install -y clang-${LLVM_VERSION} lld-${LLVM_VERSION}
# ARG LLVM_VERSION=19
# RUN echo "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-${LLVM_VERSION} main" >> /etc/apt/sources.list && \
# curl https://apt.llvm.org/llvm-snapshot.gpg.key | gpg --dearmor > /etc/apt/trusted.gpg.d/llvm-snapshot.gpg && \
# apt update && \
# apt install -y clang-${LLVM_VERSION} lld-${LLVM_VERSION}
# Cleanup.
RUN apt clean && rm -rf /var/lib/apt/lists/*

Expand Down

0 comments on commit 14d8f4a

Please sign in to comment.