mirror of
https://github.com/zeek/zeek.git
synced 2025-10-12 19:48:20 +00:00
Merge branch 'topic/christian/ci-update'
* topic/christian/ci-update: CI: add FreeBSD 13.1 and fix broken link CI: Add OpenSUSE Tumbleweed CI: drop Ubuntu 21.10, EOL 2022-07-14 CI: drop Debian 9, EOL 2022-06-30
This commit is contained in:
Christian Kreibich
commit
23cac286f3
5 changed files with 51 additions and 161 deletions
40
.cirrus.yml
40
.cirrus.yml
|
|
@ -187,20 +187,6 @@ debian10_task:
|
||||||
<< : *RESOURCES_TEMPLATE
|
<< : *RESOURCES_TEMPLATE
|
||||||
<< : *CI_TEMPLATE
|
<< : *CI_TEMPLATE
|
||||||
|
|
||||||
debian9_task:
|
|
||||||
container:
|
|
||||||
# Debian 9 EOL: June 2022
|
|
||||||
dockerfile: ci/debian-9/Dockerfile
|
|
||||||
<< : *RESOURCES_TEMPLATE
|
|
||||||
<< : *CI_TEMPLATE
|
|
||||||
|
|
||||||
debian9_32bit_task:
|
|
||||||
container:
|
|
||||||
# Debian 9 EOL: June 2022
|
|
||||||
dockerfile: ci/debian-9-32bit/Dockerfile
|
|
||||||
<< : *RESOURCES_TEMPLATE
|
|
||||||
<< : *CI_TEMPLATE
|
|
||||||
|
|
||||||
opensuse_leap_15_4_task:
|
opensuse_leap_15_4_task:
|
||||||
container:
|
container:
|
||||||
# Opensuse Leap 15.4 EOL: TBD
|
# Opensuse Leap 15.4 EOL: TBD
|
||||||
|
|
@ -215,6 +201,13 @@ opensuse_leap_15_3_task:
|
||||||
<< : *RESOURCES_TEMPLATE
|
<< : *RESOURCES_TEMPLATE
|
||||||
<< : *CI_TEMPLATE
|
<< : *CI_TEMPLATE
|
||||||
|
|
||||||
|
opensuse_tumbleweed_task:
|
||||||
|
container:
|
||||||
|
# Opensuse Tumbleweed has no EOL
|
||||||
|
dockerfile: ci/opensuse-tumbleweed/Dockerfile
|
||||||
|
<< : *RESOURCES_TEMPLATE
|
||||||
|
<< : *CI_TEMPLATE
|
||||||
|
|
||||||
ubuntu22_task:
|
ubuntu22_task:
|
||||||
container:
|
container:
|
||||||
# Ubuntu 22.04 EOL: April 2027
|
# Ubuntu 22.04 EOL: April 2027
|
||||||
|
|
@ -222,13 +215,6 @@ ubuntu22_task:
|
||||||
<< : *RESOURCES_TEMPLATE
|
<< : *RESOURCES_TEMPLATE
|
||||||
<< : *CI_TEMPLATE
|
<< : *CI_TEMPLATE
|
||||||
|
|
||||||
ubuntu21_task:
|
|
||||||
container:
|
|
||||||
# Ubuntu 21.10 EOL: July 2022
|
|
||||||
dockerfile: ci/ubuntu-21.10/Dockerfile
|
|
||||||
<< : *RESOURCES_TEMPLATE
|
|
||||||
<< : *CI_TEMPLATE
|
|
||||||
|
|
||||||
ubuntu20_task:
|
ubuntu20_task:
|
||||||
container:
|
container:
|
||||||
# Ubuntu 20.04 EOL: April 2025
|
# Ubuntu 20.04 EOL: April 2025
|
||||||
|
|
@ -268,7 +254,7 @@ macos_big_sur_task:
|
||||||
<< : *CI_TEMPLATE
|
<< : *CI_TEMPLATE
|
||||||
<< : *MACOS_ENVIRONMENT
|
<< : *MACOS_ENVIRONMENT
|
||||||
|
|
||||||
# FreeBSD EOL timelines: https://www.freebsd.org/security/security.html#sup
|
# FreeBSD EOL timelines: https://www.freebsd.org/security/#sup
|
||||||
freebsd14_task:
|
freebsd14_task:
|
||||||
freebsd_instance:
|
freebsd_instance:
|
||||||
# We don't support FreeBSD 14 yet, this is a purely informative task
|
# We don't support FreeBSD 14 yet, this is a purely informative task
|
||||||
|
|
@ -281,6 +267,16 @@ freebsd14_task:
|
||||||
<< : *CI_TEMPLATE
|
<< : *CI_TEMPLATE
|
||||||
<< : *FREEBSD_ENVIRONMENT
|
<< : *FREEBSD_ENVIRONMENT
|
||||||
|
|
||||||
|
freebsd13_1_task:
|
||||||
|
freebsd_instance:
|
||||||
|
# FreeBSD 13.1 EOL: TBD (13.2 + 3 months)
|
||||||
|
image_family: freebsd-13-1
|
||||||
|
<< : *FREEBSD_RESOURCES_TEMPLATE
|
||||||
|
|
||||||
|
prepare_script: ./ci/freebsd/prepare.sh
|
||||||
|
<< : *CI_TEMPLATE
|
||||||
|
<< : *FREEBSD_ENVIRONMENT
|
||||||
|
|
||||||
freebsd13_task:
|
freebsd13_task:
|
||||||
freebsd_instance:
|
freebsd_instance:
|
||||||
# FreeBSD 13 EOL: January 31, 2026
|
# FreeBSD 13 EOL: January 31, 2026
|
||||||
|
|
|
||||||
|
|
@ -1,50 +0,0 @@
|
||||||
FROM i386/debian:9
|
|
||||||
|
|
||||||
ENV DEBIAN_FRONTEND="noninteractive" TZ="America/Los_Angeles"
|
|
||||||
|
|
||||||
# A version field to invalide Cirrus's build cache when needed, as suggested in
|
|
||||||
# https://github.com/cirruslabs/cirrus-ci-docs/issues/544#issuecomment-566066822
|
|
||||||
ENV DOCKERFILE_VERSION 20220519
|
|
||||||
|
|
||||||
ENV CMAKE_DIR "/opt/cmake"
|
|
||||||
ENV CMAKE_VERSION "3.19.1"
|
|
||||||
ENV PATH "${CMAKE_DIR}/bin:${PATH}"
|
|
||||||
|
|
||||||
RUN apt-get update && apt-get -y install \
|
|
||||||
bison \
|
|
||||||
bsdmainutils \
|
|
||||||
ccache \
|
|
||||||
clang-11 \
|
|
||||||
curl \
|
|
||||||
flex \
|
|
||||||
git \
|
|
||||||
libc++-11-dev \
|
|
||||||
libc++abi-11-dev \
|
|
||||||
libkrb5-dev \
|
|
||||||
libpcap-dev \
|
|
||||||
libssl-dev \
|
|
||||||
make \
|
|
||||||
python3 \
|
|
||||||
python3-dev \
|
|
||||||
python3-pip\
|
|
||||||
sqlite3 \
|
|
||||||
swig \
|
|
||||||
wget \
|
|
||||||
xz-utils \
|
|
||||||
zlib1g-dev \
|
|
||||||
&& apt autoclean \
|
|
||||||
&& rm -rf /var/lib/apt/lists/*
|
|
||||||
|
|
||||||
# Recent CMake.
|
|
||||||
RUN mkdir -p "${CMAKE_DIR}" \
|
|
||||||
&& curl -sSL "https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}-Linux-x86_64.tar.gz" | tar xzf - -C "${CMAKE_DIR}" --strip-components 1
|
|
||||||
|
|
||||||
# junit2html >= 31.0.0 requires jinj2 >= 3.0 which requires python >= 3.7 which is
|
|
||||||
# a higher version of python3 than debian 9 provides. Fix the version of junit2html
|
|
||||||
# to the last version before they required the newer jinja2.
|
|
||||||
RUN pip3 install websockets junit2html==30.0.6
|
|
||||||
|
|
||||||
RUN update-alternatives --install /usr/bin/cc cc /usr/bin/clang-11 100
|
|
||||||
RUN update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++-11 100
|
|
||||||
|
|
||||||
ENV CXXFLAGS=-stdlib=libc++
|
|
||||||
|
|
@ -1,50 +0,0 @@
|
||||||
FROM debian:9
|
|
||||||
|
|
||||||
ENV DEBIAN_FRONTEND="noninteractive" TZ="America/Los_Angeles"
|
|
||||||
|
|
||||||
# A version field to invalide Cirrus's build cache when needed, as suggested in
|
|
||||||
# https://github.com/cirruslabs/cirrus-ci-docs/issues/544#issuecomment-566066822
|
|
||||||
ENV DOCKERFILE_VERSION 20220519
|
|
||||||
|
|
||||||
ENV CMAKE_DIR "/opt/cmake"
|
|
||||||
ENV CMAKE_VERSION "3.19.1"
|
|
||||||
ENV PATH "${CMAKE_DIR}/bin:${PATH}"
|
|
||||||
|
|
||||||
RUN apt-get update && apt-get -y install \
|
|
||||||
bison \
|
|
||||||
bsdmainutils \
|
|
||||||
ccache \
|
|
||||||
clang-11 \
|
|
||||||
curl \
|
|
||||||
flex \
|
|
||||||
git \
|
|
||||||
libc++-11-dev \
|
|
||||||
libc++abi-11-dev \
|
|
||||||
libkrb5-dev \
|
|
||||||
libpcap-dev \
|
|
||||||
libssl-dev \
|
|
||||||
make \
|
|
||||||
python3 \
|
|
||||||
python3-dev \
|
|
||||||
python3-pip\
|
|
||||||
sqlite3 \
|
|
||||||
swig \
|
|
||||||
wget \
|
|
||||||
xz-utils \
|
|
||||||
zlib1g-dev \
|
|
||||||
&& apt autoclean \
|
|
||||||
&& rm -rf /var/lib/apt/lists/*
|
|
||||||
|
|
||||||
# Recent CMake.
|
|
||||||
RUN mkdir -p "${CMAKE_DIR}" \
|
|
||||||
&& curl -sSL "https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}-Linux-x86_64.tar.gz" | tar xzf - -C "${CMAKE_DIR}" --strip-components 1
|
|
||||||
|
|
||||||
# junit2html >= 31.0.0 requires jinja2 >= 3.0 which requires python >= 3.7 which is
|
|
||||||
# a higher version of python3 than debian 9 provides. Fix the version of junit2html
|
|
||||||
# to the last version before they required the newer jinja2.
|
|
||||||
RUN pip3 install websockets junit2html==30.0.6
|
|
||||||
|
|
||||||
RUN update-alternatives --install /usr/bin/cc cc /usr/bin/clang-11 100
|
|
||||||
RUN update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++-11 100
|
|
||||||
|
|
||||||
ENV CXXFLAGS=-stdlib=libc++
|
|
||||||
33
ci/opensuse-tumbleweed/Dockerfile
Normal file
33
ci/opensuse-tumbleweed/Dockerfile
Normal file
|
|
@ -0,0 +1,33 @@
|
||||||
|
FROM opensuse/tumbleweed
|
||||||
|
|
||||||
|
# A version field to invalide Cirrus's build cache when needed, as suggested in
|
||||||
|
# https://github.com/cirruslabs/cirrus-ci-docs/issues/544#issuecomment-566066822
|
||||||
|
ENV DOCKERFILE_VERSION 20220705
|
||||||
|
|
||||||
|
RUN zypper refresh \
|
||||||
|
&& zypper in -y \
|
||||||
|
bison \
|
||||||
|
ccache \
|
||||||
|
cmake \
|
||||||
|
curl \
|
||||||
|
diffutils \
|
||||||
|
findutils \
|
||||||
|
flex \
|
||||||
|
gcc \
|
||||||
|
gcc-c++ \
|
||||||
|
git \
|
||||||
|
gzip \
|
||||||
|
libopenssl-devel \
|
||||||
|
libpcap-devel \
|
||||||
|
make \
|
||||||
|
python3 \
|
||||||
|
python3-devel \
|
||||||
|
python3-pip \
|
||||||
|
swig \
|
||||||
|
tar \
|
||||||
|
util-linux \
|
||||||
|
which \
|
||||||
|
zlib-devel \
|
||||||
|
&& rm -rf /var/cache/zypp
|
||||||
|
|
||||||
|
RUN pip3 install websockets junit2html
|
||||||
|
|
@ -1,39 +0,0 @@
|
||||||
FROM ubuntu:21.10
|
|
||||||
|
|
||||||
ENV DEBIAN_FRONTEND="noninteractive" TZ="America/Los_Angeles"
|
|
||||||
|
|
||||||
# A version field to invalide Cirrus's build cache when needed, as suggested in
|
|
||||||
# https://github.com/cirruslabs/cirrus-ci-docs/issues/544#issuecomment-566066822
|
|
||||||
ENV DOCKERFILE_VERSION 20220519
|
|
||||||
|
|
||||||
RUN apt-get update && apt-get -y install \
|
|
||||||
bc \
|
|
||||||
bison \
|
|
||||||
bsdmainutils \
|
|
||||||
ccache \
|
|
||||||
cmake \
|
|
||||||
curl \
|
|
||||||
flex \
|
|
||||||
g++ \
|
|
||||||
gcc \
|
|
||||||
git \
|
|
||||||
lcov \
|
|
||||||
libkrb5-dev \
|
|
||||||
libmaxminddb-dev \
|
|
||||||
libpcap-dev \
|
|
||||||
libssl-dev \
|
|
||||||
make \
|
|
||||||
python3 \
|
|
||||||
python3-dev \
|
|
||||||
python3-pip\
|
|
||||||
ruby \
|
|
||||||
sqlite3 \
|
|
||||||
swig \
|
|
||||||
unzip \
|
|
||||||
wget \
|
|
||||||
zlib1g-dev \
|
|
||||||
&& apt autoclean \
|
|
||||||
&& rm -rf /var/lib/apt/lists/*
|
|
||||||
|
|
||||||
RUN pip3 install websockets junit2html
|
|
||||||
RUN gem install coveralls-lcov
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue