Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 14:48:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Simplify CI dependencies and setup

Browse source
This commit is contained in:
Dominik Charousset 2020-11-23 17:04:47 +01:00
parent aac003223f
commit b8e4931681
2 changed files with 7 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ci/debian-9/Dockerfile
View file

@ -28,9 +28,6 @@ RUN apt-get update && apt-get -y install \
libc++abi-7-dev \ libc++abi-7-dev \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
RUN update-alternatives --install /usr/bin/cc cc /usr/bin/clang-7 100
RUN update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++-7 100
# Many distros adhere to PEP 394's recommendation for `python` = `python2` so # Many distros adhere to PEP 394's recommendation for `python` = `python2` so
# this is a simple workaround until we drop Python 2 support and explicitly # this is a simple workaround until we drop Python 2 support and explicitly
# use `python3` for all invocations (e.g. in shebangs). # use `python3` for all invocations (e.g. in shebangs).
@ -39,4 +36,6 @@ RUN ln -sf /usr/bin/pip3 /usr/local/bin/pip
RUN pip install junit2html RUN pip install junit2html
ENV CC=/usr/bin/clang-7
ENV CXX=/usr/bin/clang++-7
ENV CXXFLAGS=-stdlib=libc++ ENV CXXFLAGS=-stdlib=libc++

12
ci/ubuntu-16.04/Dockerfile
View file

@ -15,6 +15,9 @@ RUN apt-get update && apt-get -y install \
python3 \ python3 \
python3-dev \ python3-dev \
python3-pip\ python3-pip\
clang-8 \
libc++-8-dev \
libc++abi-8-dev \
swig \ swig \
zlib1g-dev \ zlib1g-dev \
libkrb5-dev \ libkrb5-dev \
@ -25,12 +28,6 @@ RUN apt-get update && apt-get -y install \
xz-utils \ xz-utils \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
RUN wget -q https://releases.llvm.org/9.0.0/clang+llvm-9.0.0-x86_64-linux-gnu-ubuntu-16.04.tar.xz
RUN mkdir /clang-9
RUN tar --strip-components=1 -C /clang-9 -xvf clang+llvm-9.0.0-x86_64-linux-gnu-ubuntu-16.04.tar.xz
RUN update-alternatives --install /usr/bin/cc cc /clang-9/bin/clang 100
RUN update-alternatives --install /usr/bin/c++ c++ /clang-9/bin/clang++ 100
# Many distros adhere to PEP 394's recommendation for `python` = `python2` so # Many distros adhere to PEP 394's recommendation for `python` = `python2` so
# this is a simple workaround until we drop Python 2 support and explicitly # this is a simple workaround until we drop Python 2 support and explicitly
# use `python3` for all invocations (e.g. in shebangs). # use `python3` for all invocations (e.g. in shebangs).
@ -39,5 +36,6 @@ RUN ln -sf /usr/bin/pip3 /usr/local/bin/pip
RUN pip install junit2html RUN pip install junit2html
ENV CC=/usr/bin/clang-8
ENV CXX=/usr/bin/clang++-8
ENV CXXFLAGS=-stdlib=libc++ ENV CXXFLAGS=-stdlib=libc++
ENV LD_LIBRARY_PATH=/clang-9/lib