Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 06:38:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Switch Zeek Spicy builds to Ubuntu 24

Browse source
This commit is contained in:
Tim Wojtulewicz 2025-08-28 12:52:01 -07:00
parent 273abf3d08
commit 692c6a2f10
2 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
.cirrus.yml
View file

@ -432,10 +432,10 @@ ubuntu22_task:
benchmark_script: ./ci/benchmark.sh benchmark_script: ./ci/benchmark.sh
# Also enable Spicy SSL for this # Also enable Spicy SSL for this
ubuntu22_spicy_task: ubuntu24_spicy_task:
container: container:
# Ubuntu 22.04 EOL: April 2027 # Ubuntu 24.04 EOL: Jun 2029
dockerfile: ci/ubuntu-22.04/Dockerfile dockerfile: ci/ubuntu-24.04/Dockerfile
<< : *RESOURCES_TEMPLATE << : *RESOURCES_TEMPLATE
<< : *CI_TEMPLATE << : *CI_TEMPLATE
<< : *ONLY_IF_PR_MASTER_RELEASE << : *ONLY_IF_PR_MASTER_RELEASE
@ -448,10 +448,10 @@ ubuntu22_spicy_task:
path: build.tgz path: build.tgz
benchmark_script: ./ci/benchmark.sh benchmark_script: ./ci/benchmark.sh
ubuntu22_spicy_head_task: ubuntu24_spicy_head_task:
container: container:
# Ubuntu 22.04 EOL: April 2027 # Ubuntu 24.04 EOL: Jun 2029
dockerfile: ci/ubuntu-22.04/Dockerfile dockerfile: ci/ubuntu-24.04/Dockerfile
<< : *RESOURCES_TEMPLATE << : *RESOURCES_TEMPLATE
<< : *CI_TEMPLATE << : *CI_TEMPLATE
<< : *ONLY_IF_PR_MASTER_RELEASE_NIGHTLY << : *ONLY_IF_PR_MASTER_RELEASE_NIGHTLY

4
ci/ubuntu-24.04/Dockerfile
View file

@ -4,7 +4,7 @@ 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 20250522 ENV DOCKERFILE_VERSION=20250522
RUN apt-get update && apt-get -y install \ RUN apt-get update && apt-get -y install \
bc \ bc \
@ -32,7 +32,9 @@ RUN apt-get update && apt-get -y install \
make \ make \
python3 \ python3 \
python3-dev \ python3-dev \
python3-git \
python3-pip \ python3-pip \
python3-semantic-version \
redis-server \ redis-server \
ruby \ ruby \
sqlite3 \ sqlite3 \