From a2b73f358633d5ef6942ea468ddcb064bf0b3c8d Mon Sep 17 00:00:00 2001 From: Christian Kreibich Date: Tue, 5 Jul 2022 13:50:59 -0700 Subject: [PATCH 1/4] CI: drop Debian 9, EOL 2022-06-30 --- .cirrus.yml | 14 ---------- ci/debian-9-32bit/Dockerfile | 50 ------------------------------------ ci/debian-9/Dockerfile | 50 ------------------------------------ 3 files changed, 114 deletions(-) delete mode 100644 ci/debian-9-32bit/Dockerfile delete mode 100644 ci/debian-9/Dockerfile diff --git a/.cirrus.yml b/.cirrus.yml index 7b80236eaa..1fa35c4110 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -187,20 +187,6 @@ debian10_task: << : *RESOURCES_TEMPLATE << : *CI_TEMPLATE -debian9_task: - container: - # Debian 9 EOL: June 2022 - dockerfile: ci/debian-9/Dockerfile - << : *RESOURCES_TEMPLATE - << : *CI_TEMPLATE - -debian9_32bit_task: - container: - # Debian 9 EOL: June 2022 - dockerfile: ci/debian-9-32bit/Dockerfile - << : *RESOURCES_TEMPLATE - << : *CI_TEMPLATE - opensuse_leap_15_4_task: container: # Opensuse Leap 15.4 EOL: TBD diff --git a/ci/debian-9-32bit/Dockerfile b/ci/debian-9-32bit/Dockerfile deleted file mode 100644 index 5602dbaf41..0000000000 --- a/ci/debian-9-32bit/Dockerfile +++ /dev/null @@ -1,50 +0,0 @@ -FROM i386/debian:9 - -ENV DEBIAN_FRONTEND="noninteractive" TZ="America/Los_Angeles" - -# A version field to invalide Cirrus's build cache when needed, as suggested in -# https://github.com/cirruslabs/cirrus-ci-docs/issues/544#issuecomment-566066822 -ENV DOCKERFILE_VERSION 20220519 - -ENV CMAKE_DIR "/opt/cmake" -ENV CMAKE_VERSION "3.19.1" -ENV PATH "${CMAKE_DIR}/bin:${PATH}" - -RUN apt-get update && apt-get -y install \ - bison \ - bsdmainutils \ - ccache \ - clang-11 \ - curl \ - flex \ - git \ - libc++-11-dev \ - libc++abi-11-dev \ - libkrb5-dev \ - libpcap-dev \ - libssl-dev \ - make \ - python3 \ - python3-dev \ - python3-pip\ - sqlite3 \ - swig \ - wget \ - xz-utils \ - zlib1g-dev \ - && apt autoclean \ - && rm -rf /var/lib/apt/lists/* - -# Recent CMake. -RUN mkdir -p "${CMAKE_DIR}" \ - && curl -sSL "https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}-Linux-x86_64.tar.gz" | tar xzf - -C "${CMAKE_DIR}" --strip-components 1 - -# junit2html >= 31.0.0 requires jinj2 >= 3.0 which requires python >= 3.7 which is -# a higher version of python3 than debian 9 provides. Fix the version of junit2html -# to the last version before they required the newer jinja2. -RUN pip3 install websockets junit2html==30.0.6 - -RUN update-alternatives --install /usr/bin/cc cc /usr/bin/clang-11 100 -RUN update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++-11 100 - -ENV CXXFLAGS=-stdlib=libc++ diff --git a/ci/debian-9/Dockerfile b/ci/debian-9/Dockerfile deleted file mode 100644 index dea6e7ead3..0000000000 --- a/ci/debian-9/Dockerfile +++ /dev/null @@ -1,50 +0,0 @@ -FROM debian:9 - -ENV DEBIAN_FRONTEND="noninteractive" TZ="America/Los_Angeles" - -# A version field to invalide Cirrus's build cache when needed, as suggested in -# https://github.com/cirruslabs/cirrus-ci-docs/issues/544#issuecomment-566066822 -ENV DOCKERFILE_VERSION 20220519 - -ENV CMAKE_DIR "/opt/cmake" -ENV CMAKE_VERSION "3.19.1" -ENV PATH "${CMAKE_DIR}/bin:${PATH}" - -RUN apt-get update && apt-get -y install \ - bison \ - bsdmainutils \ - ccache \ - clang-11 \ - curl \ - flex \ - git \ - libc++-11-dev \ - libc++abi-11-dev \ - libkrb5-dev \ - libpcap-dev \ - libssl-dev \ - make \ - python3 \ - python3-dev \ - python3-pip\ - sqlite3 \ - swig \ - wget \ - xz-utils \ - zlib1g-dev \ - && apt autoclean \ - && rm -rf /var/lib/apt/lists/* - -# Recent CMake. -RUN mkdir -p "${CMAKE_DIR}" \ - && curl -sSL "https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}-Linux-x86_64.tar.gz" | tar xzf - -C "${CMAKE_DIR}" --strip-components 1 - -# junit2html >= 31.0.0 requires jinja2 >= 3.0 which requires python >= 3.7 which is -# a higher version of python3 than debian 9 provides. Fix the version of junit2html -# to the last version before they required the newer jinja2. -RUN pip3 install websockets junit2html==30.0.6 - -RUN update-alternatives --install /usr/bin/cc cc /usr/bin/clang-11 100 -RUN update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++-11 100 - -ENV CXXFLAGS=-stdlib=libc++ From 2c263aa6c70fd403162d83ec52f3e6d7ab04d462 Mon Sep 17 00:00:00 2001 From: Christian Kreibich Date: Tue, 5 Jul 2022 13:53:09 -0700 Subject: [PATCH 2/4] CI: drop Ubuntu 21.10, EOL 2022-07-14 --- .cirrus.yml | 7 ------- ci/ubuntu-21.10/Dockerfile | 39 -------------------------------------- 2 files changed, 46 deletions(-) delete mode 100644 ci/ubuntu-21.10/Dockerfile diff --git a/.cirrus.yml b/.cirrus.yml index 1fa35c4110..118bcc3d89 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -208,13 +208,6 @@ ubuntu22_task: << : *RESOURCES_TEMPLATE << : *CI_TEMPLATE -ubuntu21_task: - container: - # Ubuntu 21.10 EOL: July 2022 - dockerfile: ci/ubuntu-21.10/Dockerfile - << : *RESOURCES_TEMPLATE - << : *CI_TEMPLATE - ubuntu20_task: container: # Ubuntu 20.04 EOL: April 2025 diff --git a/ci/ubuntu-21.10/Dockerfile b/ci/ubuntu-21.10/Dockerfile deleted file mode 100644 index 011610fbe4..0000000000 --- a/ci/ubuntu-21.10/Dockerfile +++ /dev/null @@ -1,39 +0,0 @@ -FROM ubuntu:21.10 - -ENV DEBIAN_FRONTEND="noninteractive" TZ="America/Los_Angeles" - -# A version field to invalide Cirrus's build cache when needed, as suggested in -# https://github.com/cirruslabs/cirrus-ci-docs/issues/544#issuecomment-566066822 -ENV DOCKERFILE_VERSION 20220519 - -RUN apt-get update && apt-get -y install \ - bc \ - bison \ - bsdmainutils \ - ccache \ - cmake \ - curl \ - flex \ - g++ \ - gcc \ - git \ - lcov \ - libkrb5-dev \ - libmaxminddb-dev \ - libpcap-dev \ - libssl-dev \ - make \ - python3 \ - python3-dev \ - python3-pip\ - ruby \ - sqlite3 \ - swig \ - unzip \ - wget \ - zlib1g-dev \ - && apt autoclean \ - && rm -rf /var/lib/apt/lists/* - -RUN pip3 install websockets junit2html -RUN gem install coveralls-lcov From 39f98778e4e92df9facdbd274f83e2b96ef12a46 Mon Sep 17 00:00:00 2001 From: Christian Kreibich Date: Tue, 5 Jul 2022 14:03:44 -0700 Subject: [PATCH 3/4] CI: Add OpenSUSE Tumbleweed --- .cirrus.yml | 7 +++++++ ci/opensuse-tumbleweed/Dockerfile | 33 +++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+) create mode 100644 ci/opensuse-tumbleweed/Dockerfile diff --git a/.cirrus.yml b/.cirrus.yml index 118bcc3d89..878ddeb1f4 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -201,6 +201,13 @@ opensuse_leap_15_3_task: << : *RESOURCES_TEMPLATE << : *CI_TEMPLATE +opensuse_tumbleweed_task: + container: + # Opensuse Tumbleweed has no EOL + dockerfile: ci/opensuse-tumbleweed/Dockerfile + << : *RESOURCES_TEMPLATE + << : *CI_TEMPLATE + ubuntu22_task: container: # Ubuntu 22.04 EOL: April 2027 diff --git a/ci/opensuse-tumbleweed/Dockerfile b/ci/opensuse-tumbleweed/Dockerfile new file mode 100644 index 0000000000..1367e541a7 --- /dev/null +++ b/ci/opensuse-tumbleweed/Dockerfile @@ -0,0 +1,33 @@ +FROM opensuse/tumbleweed + +# A version field to invalide Cirrus's build cache when needed, as suggested in +# https://github.com/cirruslabs/cirrus-ci-docs/issues/544#issuecomment-566066822 +ENV DOCKERFILE_VERSION 20220705 + +RUN zypper refresh \ + && zypper in -y \ + bison \ + ccache \ + cmake \ + curl \ + diffutils \ + findutils \ + flex \ + gcc \ + gcc-c++ \ + git \ + gzip \ + libopenssl-devel \ + libpcap-devel \ + make \ + python3 \ + python3-devel \ + python3-pip \ + swig \ + tar \ + util-linux \ + which \ + zlib-devel \ + && rm -rf /var/cache/zypp + +RUN pip3 install websockets junit2html From 94ef182a97124a1f24c9ff55f71ea4eb7cf65f32 Mon Sep 17 00:00:00 2001 From: Christian Kreibich Date: Wed, 6 Jul 2022 21:58:56 -0700 Subject: [PATCH 4/4] CI: add FreeBSD 13.1 and fix broken link --- .cirrus.yml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index 878ddeb1f4..88feda6881 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -254,7 +254,7 @@ macos_big_sur_task: << : *CI_TEMPLATE << : *MACOS_ENVIRONMENT -# FreeBSD EOL timelines: https://www.freebsd.org/security/security.html#sup +# FreeBSD EOL timelines: https://www.freebsd.org/security/#sup freebsd14_task: freebsd_instance: # We don't support FreeBSD 14 yet, this is a purely informative task @@ -267,6 +267,16 @@ freebsd14_task: << : *CI_TEMPLATE << : *FREEBSD_ENVIRONMENT +freebsd13_1_task: + freebsd_instance: + # FreeBSD 13.1 EOL: TBD (13.2 + 3 months) + image_family: freebsd-13-1 + << : *FREEBSD_RESOURCES_TEMPLATE + + prepare_script: ./ci/freebsd/prepare.sh + << : *CI_TEMPLATE + << : *FREEBSD_ENVIRONMENT + freebsd13_task: freebsd_instance: # FreeBSD 13 EOL: January 31, 2026