From 99f36ce01a7563b30e981b57fd5f70b1ec02cb0a Mon Sep 17 00:00:00 2001 From: Arne Welzel Date: Wed, 23 Apr 2025 14:59:04 +0200 Subject: [PATCH] CI: No more Ubuntu 20.04 [skip ci] Ubuntu 20.04's default Python doesn't deal well with the type annotations used in btest/Files/wstest.py. Given that it's about to be EOL, just remove it. --- .cirrus.yml | 8 -------- ci/ubuntu-20.04/Dockerfile | 40 -------------------------------------- 2 files changed, 48 deletions(-) delete mode 100644 ci/ubuntu-20.04/Dockerfile diff --git a/.cirrus.yml b/.cirrus.yml index 9be142d5f4..99f0cafa84 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -357,14 +357,6 @@ ubuntu22_spicy_head_task: skip: $CIRRUS_BRANCH =~ 'release/.*' << : *BENCHMARK_ONLY_IF_TEMPLATE -ubuntu20_task: - container: - # Ubuntu 20.04 EOL: April 2025 - dockerfile: ci/ubuntu-20.04/Dockerfile - << : *RESOURCES_TEMPLATE - << : *CI_TEMPLATE - << : *SKIP_TASK_ON_PR - alpine_task: container: # Alpine releases typically happen every 6 months w/ support for 2 years. diff --git a/ci/ubuntu-20.04/Dockerfile b/ci/ubuntu-20.04/Dockerfile deleted file mode 100644 index a643242370..0000000000 --- a/ci/ubuntu-20.04/Dockerfile +++ /dev/null @@ -1,40 +0,0 @@ -FROM ubuntu:20.04 - -ENV DEBIAN_FRONTEND="noninteractive" TZ="America/Los_Angeles" - -# 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 apt-get update && apt-get -y install \ - bc \ - bison \ - bsdmainutils \ - ccache \ - cmake \ - curl \ - flex \ - g++ \ - gcc \ - git \ - jq \ - lcov \ - libkrb5-dev \ - libmaxminddb-dev \ - libpcap-dev \ - libssl-dev \ - libzmq3-dev \ - make \ - python3.9 \ - python3.9-dev \ - python3-pip\ - ruby \ - sqlite3 \ - swig \ - unzip \ - wget \ - zlib1g-dev \ - && apt autoclean \ - && rm -rf /var/lib/apt/lists/* - -RUN pip3 install websockets junit2html