Skip to content

Commit fca9fc3

Browse files
committed
add syntax directive
1 parent 9b370b6 commit fca9fc3

File tree

1 file changed

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

1 file changed

+7
-9
lines changed

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

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
1+
# syntax=docker/dockerfile:1.7
12
ARG LLVM_VERSION=21.1.0
2-
ARG LLVM_VERSION_MAJOR=21
33

44
FROM docker.io/library/ubuntu:24.04 AS llvm-downloader
55
ARG LLVM_VERSION
6-
ARG LLVM_VERSION_MAJOR
76

87
RUN apt-get update && \
98
apt-get install -y wget xz-utils && \
109
wget -O llvm.tar.xz https://github.com/llvm/llvm-project/releases/download/llvmorg-${LLVM_VERSION}/LLVM-${LLVM_VERSION}-Linux-X64.tar.xz && \
1110
mkdir -p /llvm-extract && \
1211
tar -xvJf llvm.tar.xz -C /llvm-extract \
1312
# Only unpack these tools to save space on Github runner.
14-
LLVM-${LLVM_VERSION}-Linux-X64/bin/clang-${LLVM_VERSION_MAJOR} \
15-
LLVM-${LLVM_VERSION}-Linux-X64/lib/clang/${LLVM_VERSION_MAJOR}/include \
13+
LLVM-${LLVM_VERSION}-Linux-X64/bin/clang-${LLVM_VERSION%%.*} \
14+
LLVM-${LLVM_VERSION}-Linux-X64/lib/clang/${LLVM_VERSION%%.*}/include \
1615
LLVM-${LLVM_VERSION}-Linux-X64/bin/clang-tidy \
1716
LLVM-${LLVM_VERSION}-Linux-X64/bin/clang-format \
1817
LLVM-${LLVM_VERSION}-Linux-X64/bin/git-clang-format && \
@@ -54,16 +53,15 @@ RUN pip install -r requirements_formatting.txt --break-system-packages && \
5453

5554
FROM base AS ci-container-code-lint
5655
ARG LLVM_VERSION
57-
ARG LLVM_VERSION_MAJOR
5856

5957
COPY --from=llvm-downloader /llvm-extract/LLVM-${LLVM_VERSION}-Linux-X64/bin/clang-tidy \
60-
/llvm-extract/LLVM-${LLVM_VERSION}-Linux-X64/bin/clang-${LLVM_VERSION_MAJOR} \
58+
/llvm-extract/LLVM-${LLVM_VERSION}-Linux-X64/bin/clang-${LLVM_VERSION%%.*} \
6159
${LLVM_SYSROOT}/bin/
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
60+
COPY --from=llvm-downloader /llvm-extract/LLVM-${LLVM_VERSION}-Linux-X64/lib/clang/${LLVM_VERSION%%.*}/include \
61+
${LLVM_SYSROOT}/lib/clang/${LLVM_VERSION%%.*}/include
6462
COPY clang-tools-extra/clang-tidy/tool/clang-tidy-diff.py ${LLVM_SYSROOT}/bin/clang-tidy-diff.py
6563

66-
RUN ln -s ${LLVM_SYSROOT}/bin/clang-${LLVM_VERSION_MAJOR} ${LLVM_SYSROOT}/bin/clang && \
64+
RUN ln -s ${LLVM_SYSROOT}/bin/clang-${LLVM_VERSION%%.*} ${LLVM_SYSROOT}/bin/clang && \
6765
ln -s ${LLVM_SYSROOT}/bin/clang ${LLVM_SYSROOT}/bin/clang++
6866

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

0 commit comments

Comments
 (0)