diff --git a/.cirrus.yml b/.cirrus.yml index f9e37cedab..4215e4fc7e 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -417,20 +417,6 @@ ubuntu24_04_clang_tidy_task: CXX: clang++-19 ZEEK_CI_CONFIGURE_FLAGS: *CLANG_TIDY_CONFIG -ubuntu22_04_task: - container: - # Ubuntu 22.04 EOL: June 2027 - dockerfile: ci/ubuntu-22.04/Dockerfile - << : *RESOURCES_TEMPLATE - << : *CI_TEMPLATE - << : *ONLY_IF_PR_MASTER_RELEASE - << : *SKIP_IF_PR_NOT_FULL_OR_BENCHMARK - env: - ZEEK_CI_CREATE_ARTIFACT: 1 - upload_binary_artifacts: - path: build.tgz - benchmark_script: ./ci/benchmark.sh - # Also enable Spicy SSL for this ubuntu24_04_spicy_task: container: @@ -466,6 +452,20 @@ ubuntu24_04_spicy_head_task: path: build.tgz benchmark_script: ./ci/benchmark.sh +ubuntu22_04_task: + container: + # Ubuntu 22.04 EOL: June 2027 + dockerfile: ci/ubuntu-22.04/Dockerfile + << : *RESOURCES_TEMPLATE + << : *CI_TEMPLATE + << : *ONLY_IF_PR_MASTER_RELEASE + << : *SKIP_IF_PR_NOT_FULL_OR_BENCHMARK + env: + ZEEK_CI_CREATE_ARTIFACT: 1 + upload_binary_artifacts: + path: build.tgz + benchmark_script: ./ci/benchmark.sh + alpine_task: container: # Alpine releases typically happen every 6 months w/ support for 2 years.