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

Merge remote-tracking branch 'origin/topic/jsiwek/ci-debian-10-gcc'

Browse source 
* origin/topic/jsiwek/ci-debian-10-gcc:
  Change Debian 10 CI config to use GCC
This commit is contained in:
Tim Wojtulewicz 2020-11-10 13:55:33 -07:00
commit 2e57f8487b
3 changed files with 7 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
CHANGES
View file

@ -1,4 +1,10 @@
3.3.0-dev.512 | 2020-11-10 13:55:33 -0700
* Change Debian 10 CI config to use GCC (Jon Siwek, Corelight)
* Update external testing repo hashes for canonification updates (Tim Wojtulewicz, Corelight)
3.3.0-dev.509 | 2020-11-10 08:41:54 -0700 3.3.0-dev.509 | 2020-11-10 08:41:54 -0700
* GH-1221: Add unknown_protocols.log for logging packet analyzer lookup failures (Tim Wojtulewicz, Corelight) * GH-1221: Add unknown_protocols.log for logging packet analyzer lookup failures (Tim Wojtulewicz, Corelight)

2
VERSION
View file

@ -1 +1 @@
3.3.0-dev.509 3.3.0-dev.512

8
ci/debian-10/Dockerfile
View file

@ -23,14 +23,8 @@ RUN apt-get update && apt-get -y install \
curl \ curl \
wget \ wget \
xz-utils \ xz-utils \
clang \
libc++-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 100
RUN update-alternatives --install /usr/bin/c++ c++ /usr/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).
@ -38,5 +32,3 @@ RUN ln -sf /usr/bin/python3 /usr/local/bin/python
RUN ln -sf /usr/bin/pip3 /usr/local/bin/pip RUN ln -sf /usr/bin/pip3 /usr/local/bin/pip
RUN pip install junit2html RUN pip install junit2html
ENV CXXFLAGS=-stdlib=libc++