Skip to content

Commit dd4608d

Browse files
committed
removed scripts updated docker
1 parent 449b849 commit dd4608d

4 files changed

Lines changed: 19 additions & 268 deletions

File tree

azure.yml

Lines changed: 0 additions & 107 deletions
This file was deleted.

docker/Dockerfile

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,11 @@
55
FROM ubuntu:22.10 as cpp-docker-common
66

77
ARG DEBIAN_FRONTEND=noninteractive
8+
ARG CLANG_COMPILER_VERSION=15
9+
ARG CMAKE_VERSION=3.26.3
810
ENV PATH="${PATH}:/cmake-3.26.3-linux-x86_64/bin/:"
911

1012
RUN apt-get update && apt-get -y dist-upgrade && apt-get -y install --fix-missing \
11-
apturl \
1213
binutils \
1314
build-essential \
1415
bzip2 \
@@ -27,13 +28,23 @@ RUN apt-get update && apt-get -y dist-upgrade && apt-get -y install --fix-missin
2728
tar \
2829
valgrind \
2930
wget
30-
RUN wget https://github.com/Kitware/CMake/releases/download/v3.26.3/cmake-3.26.3-linux-x86_64.sh \
31-
&& chmod +x cmake-3.26.3-linux-x86_64.sh \
32-
&& ./cmake-3.26.3-linux-x86_64.sh --include-subdir --skip-license \
33-
&& rm cmake-3.26.3-linux-x86_64.sh
31+
32+
RUN wget https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}-linux-x86_64.sh \
33+
&& chmod +x cmake-${CMAKE_VERSION}-linux-x86_64.sh \
34+
&& ./cmake-${CMAKE_VERSION}-linux-x86_64.sh --include-subdir --skip-license \
35+
&& rm cmake-${CMAKE_VERSION}-linux-x86_64.sh
3436
RUN bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)"
35-
RUN apt-get -y install clang-format clang-tidy clang-15
36-
RUN apt-get autoremove -y && apt-get clean
37+
38+
RUN apt-get -y install --fix-missing clang-format clang-tidy clang-${PATH} llvm-${PATH} llvm-${PATH}-dev libclang-${PATH}-dev \
39+
&& apt-get autoremove -y && apt-get clean
40+
41+
RUN mkdir iwyu && cd iwyu \
42+
&& git clone --branch clang_${PATH} https://github.com/include-what-you-use/include-what-you-use.git \
43+
&& mkdir build && cd build \
44+
&& cmake -G "Ninja" -DCMAKE_PREFIX_PATH=/usr/lib/llvm-${PATH} ../include-what-you-use \
45+
&& sudo ninja install \
46+
&& cd ../.. \
47+
&& rm -rf iwyu
3748

3849

3950
# =================================

docker/build-ci-image.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@
22

33
DOCKER_BUILDKIT=1 docker -l debug build \
44
--target cpp-docker-ci \
5+
--build-arg CI_USER=ci \
56
-t cpp_ci_env:latest .

scripts/run-clang-format.py

Lines changed: 0 additions & 154 deletions
This file was deleted.

0 commit comments

Comments
 (0)