Skip to content

Commit 9b370b6

Browse files
committed
fix podman build error
1 parent bfd76b3 commit 9b370b6

File tree

1 file changed

+9
-7
lines changed
  • .github/workflows/containers/github-action-ci-tooling

1 file changed

+9
-7
lines changed

.github/workflows/containers/github-action-ci-tooling/Dockerfile

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
11
ARG LLVM_VERSION=21.1.0
2+
ARG LLVM_VERSION_MAJOR=21
23

34
FROM docker.io/library/ubuntu:24.04 AS llvm-downloader
45
ARG LLVM_VERSION
6+
ARG LLVM_VERSION_MAJOR
57

68
RUN apt-get update && \
79
apt-get install -y wget xz-utils && \
810
wget -O llvm.tar.xz https://github.com/llvm/llvm-project/releases/download/llvmorg-${LLVM_VERSION}/LLVM-${LLVM_VERSION}-Linux-X64.tar.xz && \
911
mkdir -p /llvm-extract && \
1012
tar -xvJf llvm.tar.xz -C /llvm-extract \
1113
# Only unpack these tools to save space on Github runner.
12-
LLVM-${LLVM_VERSION}-Linux-X64/bin/clang-${LLVM_VERSION%%.*} \
13-
LLVM-${LLVM_VERSION}-Linux-X64/lib/clang/${LLVM_VERSION%%.*}/include \
14+
LLVM-${LLVM_VERSION}-Linux-X64/bin/clang-${LLVM_VERSION_MAJOR} \
15+
LLVM-${LLVM_VERSION}-Linux-X64/lib/clang/${LLVM_VERSION_MAJOR}/include \
1416
LLVM-${LLVM_VERSION}-Linux-X64/bin/clang-tidy \
1517
LLVM-${LLVM_VERSION}-Linux-X64/bin/clang-format \
1618
LLVM-${LLVM_VERSION}-Linux-X64/bin/git-clang-format && \
@@ -52,16 +54,16 @@ RUN pip install -r requirements_formatting.txt --break-system-packages && \
5254

5355
FROM base AS ci-container-code-lint
5456
ARG LLVM_VERSION
57+
ARG LLVM_VERSION_MAJOR
5558

5659
COPY --from=llvm-downloader /llvm-extract/LLVM-${LLVM_VERSION}-Linux-X64/bin/clang-tidy \
57-
/llvm-extract/LLVM-${LLVM_VERSION}-Linux-X64/bin/clang-${LLVM_VERSION%%.*} \
60+
/llvm-extract/LLVM-${LLVM_VERSION}-Linux-X64/bin/clang-${LLVM_VERSION_MAJOR} \
5861
${LLVM_SYSROOT}/bin/
59-
COPY --from=llvm-downloader /llvm-extract/LLVM-${LLVM_VERSION}-Linux-X64/lib/clang/${LLVM_VERSION%%.*}/include \
60-
${LLVM_SYSROOT}/lib/clang/${LLVM_VERSION%%.*}/include
62+
COPY --from=llvm-downloader /llvm-extract/LLVM-${LLVM_VERSION}-Linux-X64/lib/clang/${LLVM_VERSION_MAJOR}/include \
63+
${LLVM_SYSROOT}/lib/clang/${LLVM_VERSION_MAJOR}/include
6164
COPY clang-tools-extra/clang-tidy/tool/clang-tidy-diff.py ${LLVM_SYSROOT}/bin/clang-tidy-diff.py
6265

63-
# Make symlinks as in LLVM tar.xz package
64-
RUN ln -s ${LLVM_SYSROOT}/bin/clang-${LLVM_VERSION%%.*} ${LLVM_SYSROOT}/bin/clang && \
66+
RUN ln -s ${LLVM_SYSROOT}/bin/clang-${LLVM_VERSION_MAJOR} ${LLVM_SYSROOT}/bin/clang && \
6567
ln -s ${LLVM_SYSROOT}/bin/clang ${LLVM_SYSROOT}/bin/clang++
6668

6769
ENV PATH=${LLVM_SYSROOT}/bin:${PATH}

0 commit comments

Comments
 (0)