Merge remote-tracking branch 'origin/topic/johanna/ci_for_ubuntu_25_04_instead_of_ubuntu_24_10_because_that_one_is_at_eol'

* origin/topic/johanna/ci_for_ubuntu_25_04_instead_of_ubuntu_24_10_because_that_one_is_at_eol:
  CI: Ubuntu 24.10 is eol, add Ubuntu 25.04
This commit is contained in:
Johanna Amann 2025-08-19 15:23:20 +01:00
commit 8d89e035fd
2 changed files with 4 additions and 4 deletions

View file

@ -296,10 +296,10 @@ weekly_current_clang_task:
env: env:
ZEEK_CI_COMPILER: clang ZEEK_CI_COMPILER: clang
ubuntu24_10_task: ubuntu25_04_task:
container: container:
# Ubuntu 24.10 EOL: 2025-07-30 # Ubuntu 25.04 EOL: 2026-01-31
dockerfile: ci/ubuntu-24.10/Dockerfile dockerfile: ci/ubuntu-25.04/Dockerfile
<< : *RESOURCES_TEMPLATE << : *RESOURCES_TEMPLATE
<< : *CI_TEMPLATE << : *CI_TEMPLATE
<< : *SKIP_TASK_ON_PR << : *SKIP_TASK_ON_PR

View file

@ -1,4 +1,4 @@
FROM ubuntu:24.10 FROM ubuntu:25.04
ENV DEBIAN_FRONTEND="noninteractive" TZ="America/Los_Angeles" ENV DEBIAN_FRONTEND="noninteractive" TZ="America/Los_Angeles"