mirror of
https://github.com/zeek/zeek.git
synced 2025-10-02 14:48:21 +00:00
Merge remote-tracking branch 'origin/topic/christian/ci-updates'
* origin/topic/christian/ci-updates: CI: bump FreeBSD 14 to 14.2, which came out in Dec'24 CI: remove OpenSuSE Leap 15.5, EOL.
This commit is contained in:
commit
ecb1a65610
2 changed files with 1 additions and 51 deletions
10
.cirrus.yml
10
.cirrus.yml
|
@ -245,14 +245,6 @@ debian11_task:
|
||||||
<< : *CI_TEMPLATE
|
<< : *CI_TEMPLATE
|
||||||
<< : *SKIP_TASK_ON_PR
|
<< : *SKIP_TASK_ON_PR
|
||||||
|
|
||||||
opensuse_leap_15_5_task:
|
|
||||||
container:
|
|
||||||
# Opensuse Leap 15.5 EOL: ~Dec 2024
|
|
||||||
dockerfile: ci/opensuse-leap-15.5/Dockerfile
|
|
||||||
<< : *RESOURCES_TEMPLATE
|
|
||||||
<< : *CI_TEMPLATE
|
|
||||||
<< : *SKIP_TASK_ON_PR
|
|
||||||
|
|
||||||
opensuse_leap_15_6_task:
|
opensuse_leap_15_6_task:
|
||||||
container:
|
container:
|
||||||
# Opensuse Leap 15.6 EOL: ~Dec 2025
|
# Opensuse Leap 15.6 EOL: ~Dec 2025
|
||||||
|
@ -385,7 +377,7 @@ macos_sonoma_task:
|
||||||
freebsd14_task:
|
freebsd14_task:
|
||||||
freebsd_instance:
|
freebsd_instance:
|
||||||
# FreeBSD 14 EOL: Nov 30 2028
|
# FreeBSD 14 EOL: Nov 30 2028
|
||||||
image_family: freebsd-14-1
|
image_family: freebsd-14-2
|
||||||
<< : *FREEBSD_RESOURCES_TEMPLATE
|
<< : *FREEBSD_RESOURCES_TEMPLATE
|
||||||
|
|
||||||
prepare_script: ./ci/freebsd/prepare.sh
|
prepare_script: ./ci/freebsd/prepare.sh
|
||||||
|
|
|
@ -1,42 +0,0 @@
|
||||||
FROM opensuse/leap:15.5
|
|
||||||
|
|
||||||
# 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
|
|
||||||
ENV DOCKERFILE_VERSION 20241024
|
|
||||||
|
|
||||||
RUN zypper addrepo https://download.opensuse.org/repositories/openSUSE:Leap:15.5:Update/standard/openSUSE:Leap:15.5:Update.repo \
|
|
||||||
&& zypper refresh \
|
|
||||||
&& zypper in -y \
|
|
||||||
bison \
|
|
||||||
ccache \
|
|
||||||
cmake \
|
|
||||||
cppzmq-devel \
|
|
||||||
curl \
|
|
||||||
flex \
|
|
||||||
gcc12 \
|
|
||||||
gcc12-c++ \
|
|
||||||
git \
|
|
||||||
gzip \
|
|
||||||
jq \
|
|
||||||
libopenssl-devel \
|
|
||||||
libpcap-devel \
|
|
||||||
make \
|
|
||||||
openssh \
|
|
||||||
procps \
|
|
||||||
python311 \
|
|
||||||
python311-devel \
|
|
||||||
python311-pip \
|
|
||||||
swig \
|
|
||||||
tar \
|
|
||||||
which \
|
|
||||||
zlib-devel \
|
|
||||||
&& rm -rf /var/cache/zypp
|
|
||||||
|
|
||||||
RUN update-alternatives --install /usr/bin/pip3 pip3 /usr/bin/pip3.11 100
|
|
||||||
RUN update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.11 100
|
|
||||||
RUN update-alternatives --install /usr/bin/python3-config python3-config /usr/bin/python3.11-config 100
|
|
||||||
|
|
||||||
RUN pip3 install websockets junit2html
|
|
||||||
|
|
||||||
RUN update-alternatives --install /usr/bin/cc cc /usr/bin/gcc-12 100
|
|
||||||
RUN update-alternatives --install /usr/bin/c++ c++ /usr/bin/g++-12 100
|
|
Loading…
Add table
Add a link
Reference in a new issue