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: Add Debian 13.0 (trixie)

Browse source
This commit is contained in:
Arne Welzel 2025-08-13 15:03:35 +02:00
parent 91afdd03b8
commit ccd4a2935c
2 changed files with 25 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

30
.cirrus.yml
View file

@ -208,51 +208,51 @@ centosstream9_task:
<< : *RESOURCES_TEMPLATE << : *RESOURCES_TEMPLATE
<< : *CI_TEMPLATE << : *CI_TEMPLATE
debian12_task: debian13_task:
container: container:
# Debian 12 (bookworm) EOL: TBD # Debian 13 (trixie) EOL: TBD
dockerfile: ci/debian-12/Dockerfile dockerfile: ci/debian-13/Dockerfile
<< : *RESOURCES_TEMPLATE << : *RESOURCES_TEMPLATE
<< : *CI_TEMPLATE << : *CI_TEMPLATE
arm_debian12_task: arm_debian13_task:
arm_container: arm_container:
# Debian 12 (bookworm) EOL: TBD # Debian 13 (trixie) EOL: TBD
dockerfile: ci/debian-12/Dockerfile dockerfile: ci/debian-13/Dockerfile
<< : *RESOURCES_TEMPLATE << : *RESOURCES_TEMPLATE
<< : *CI_TEMPLATE << : *CI_TEMPLATE
env: env:
ZEEK_CI_CONFIGURE_FLAGS: *NO_SPICY_CONFIG ZEEK_CI_CONFIGURE_FLAGS: *NO_SPICY_CONFIG
debian12_static_task: debian13_static_task:
container: container:
# Just use a recent/common distro to run a static compile test. # Just use a recent/common distro to run a static compile test.
# Debian 12 (bookworm) EOL: TBD # Debian 13 (trixie) EOL: TBD
dockerfile: ci/debian-12/Dockerfile dockerfile: ci/debian-13/Dockerfile
<< : *RESOURCES_TEMPLATE << : *RESOURCES_TEMPLATE
<< : *CI_TEMPLATE << : *CI_TEMPLATE
<< : *SKIP_TASK_ON_PR << : *SKIP_TASK_ON_PR
env: env:
ZEEK_CI_CONFIGURE_FLAGS: *STATIC_CONFIG ZEEK_CI_CONFIGURE_FLAGS: *STATIC_CONFIG
debian12_binary_task: debian13_binary_task:
container: container:
# Just use a recent/common distro to run binary mode compile test. # Just use a recent/common distro to run binary mode compile test.
# As of 2024-03, the used configure flags are equivalent to the flags # As of 2024-03, the used configure flags are equivalent to the flags
# that we use to create binary packages. # that we use to create binary packages.
# Just use a recent/common distro to run a static compile test. # Just use a recent/common distro to run a static compile test.
# Debian 12 (bookworm) EOL: TBD # Debian 13 (trixie) EOL: TBD
dockerfile: ci/debian-12/Dockerfile dockerfile: ci/debian-13/Dockerfile
<< : *RESOURCES_TEMPLATE << : *RESOURCES_TEMPLATE
<< : *CI_TEMPLATE << : *CI_TEMPLATE
<< : *SKIP_TASK_ON_PR << : *SKIP_TASK_ON_PR
env: env:
ZEEK_CI_CONFIGURE_FLAGS: *BINARY_CONFIG ZEEK_CI_CONFIGURE_FLAGS: *BINARY_CONFIG
debian11_task: debian12_task:
container: container:
# Debian 11 EOL: June 2026 # Debian 12 (bookworm) EOL: TBD
dockerfile: ci/debian-11/Dockerfile dockerfile: ci/debian-12/Dockerfile
<< : *RESOURCES_TEMPLATE << : *RESOURCES_TEMPLATE
<< : *CI_TEMPLATE << : *CI_TEMPLATE
<< : *SKIP_TASK_ON_PR << : *SKIP_TASK_ON_PR

14
ci/debian-11/Dockerfile → ci/debian-13/Dockerfile
View file

@ -1,32 +1,36 @@
FROM debian:11 FROM debian:13
ENV DEBIAN_FRONTEND="noninteractive" TZ="America/Los_Angeles" ENV DEBIAN_FRONTEND="noninteractive" TZ="America/Los_Angeles"
# A version field to invalidate Cirrus's build cache when needed, as suggested in # A version field to invalidate Cirrus's build cache when needed, as suggested in
# https://github.com/cirruslabs/cirrus-ci-docs/issues/544#issuecomment-566066822 # https://github.com/cirruslabs/cirrus-ci-docs/issues/544#issuecomment-566066822
ENV DOCKERFILE_VERSION 20241024 ENV DOCKERFILE_VERSION 20250813
RUN apt-get update && apt-get -y install \ RUN apt-get update && apt-get -y install \
bison \ bison \
bsdmainutils \ bsdmainutils \
ccache \ ccache \
cmake \ cmake \
cppzmq-dev \
curl \ curl \
dnsmasq \
flex \ flex \
g++ \ g++ \
gcc \ gcc \
git \ git \
jq \ jq \
libkrb5-dev \ libkrb5-dev \
libnats-dev \
libnode-dev \ libnode-dev \
libpcap-dev \ libpcap-dev \
librdkafka-dev \
libssl-dev \ libssl-dev \
libuv1-dev \ libuv1-dev \
libzmq3-dev \
make \ make \
python3 \ python3 \
python3-dev \ python3-dev \
python3-pip\ python3-pip\
python3-websockets \
sqlite3 \ sqlite3 \
swig \ swig \
wget \ wget \
@ -35,4 +39,6 @@ RUN apt-get update && apt-get -y install \
&& apt autoclean \ && apt autoclean \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
RUN pip3 install websockets junit2html # Debian trixie really doesn't like using pip to install system wide stuff, but
# doesn't seem there's a python3-junit2html package, so not sure what we'd break.
RUN pip3 install --break-system-packages junit2html