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

CI support refresh

Browse source 
- Add Debian 11 (Bullseye)
- Drop Ubuntu 16.04

Includes submodule bumps for corresponding updates
This commit is contained in:
Christian Kreibich 2021-08-25 12:45:02 -07:00
parent d75663c4b8
commit 7b60800231
4 changed files with 20 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

34
.cirrus.yml
View file

@ -133,6 +133,23 @@ centos7_task:
<< : *RESOURCES_TEMPLATE
<< : *CI_TEMPLATE
debian11_task:
container:
# Debian 11 EOL: June 2026
dockerfile: ci/debian-11/Dockerfile
<< : *RESOURCES_TEMPLATE
<< : *CI_TEMPLATE
debian11_static_task:
container:
# Just use a recent/common distro to run a static compile test.
# Debian 11 EOL: June 2026
dockerfile: ci/debian-11/Dockerfile
<< : *RESOURCES_TEMPLATE
<< : *CI_TEMPLATE
env:
ZEEK_CI_CONFIGURE_FLAGS: *STATIC_CONFIG
debian10_task:
container:
# Debian 10 EOL: June 2024
@ -140,16 +157,6 @@ debian10_task:
<< : *RESOURCES_TEMPLATE
<< : *CI_TEMPLATE
debian10_static_task:
container:
# Just uses a recent/common distro to run a static compile test.
# Debian 10 EOL: June 2024
dockerfile: ci/debian-10/Dockerfile
<< : *RESOURCES_TEMPLATE
<< : *CI_TEMPLATE
env:
ZEEK_CI_CONFIGURE_FLAGS: *STATIC_CONFIG
debian9_task:
container:
# Debian 9 EOL: June 2022
@ -194,13 +201,6 @@ ubuntu18_task:
env:
ZEEK_CI_CONFIGURE_FLAGS: *MOBILE_IPV6_CONFIG
ubuntu16_task:
container:
# Ubuntu 16.04 EOL: April 2021
dockerfile: ci/ubuntu-16.04/Dockerfile
<< : *RESOURCES_TEMPLATE
<< : *CI_TEMPLATE
alpine_task:
container:
# Alpine releases typically happen every 6 months w/ support for 2 years.

2
auxil/broker

@ -1 +1 @@
Subproject commit bef5e0b485c63e3da4bde9cf01285634a0587cc6
Subproject commit 7b856adaec012a8d9072aaa4d268565060fbd116

2
auxil/zeek-archiver

@ -1 +1 @@
Subproject commit d3e55991cbe69f37966207479492edd38d548b1d
Subproject commit d3ea09224556e9f206eb6de89cb1f5294bacafcf

9
ci/ubuntu-16.04/Dockerfile → ci/debian-11/Dockerfile
View file

@ -1,4 +1,4 @@
FROM ubuntu:16.04
FROM debian:11
ENV DEBIAN_FRONTEND="noninteractive" TZ="America/Los_Angeles"
@ -15,9 +15,6 @@ RUN apt-get update && apt-get -y install \
python3 \
python3-dev \
python3-pip\
clang-8 \
libc++-8-dev \
libc++abi-8-dev \
swig \
zlib1g-dev \
libkrb5-dev \
@ -29,7 +26,3 @@ RUN apt-get update && apt-get -y install \
&& rm -rf /var/lib/apt/lists/*
RUN pip3 install junit2html
ENV CC=/usr/bin/clang-8
ENV CXX=/usr/bin/clang++-8
ENV CXXFLAGS=-stdlib=libc++