diff --git a/.cirrus.yml b/.cirrus.yml index 59499d7a8e..fcee415eb7 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -260,10 +260,10 @@ opensuse_tumbleweed_task: << : *CI_TEMPLATE # << : *SKIP_TASK_ON_PR -ubuntu2210_task: +ubuntu23_task: container: - # Ubuntu 22.10 EOL: July 2023 - dockerfile: ci/ubuntu-22.10/Dockerfile + # Ubuntu 23.04 EOL: January 2024 + dockerfile: ci/ubuntu-23.04/Dockerfile << : *RESOURCES_TEMPLATE << : *CI_TEMPLATE diff --git a/CHANGES b/CHANGES index 1a936d2d0e..0f8c18db22 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,9 @@ +6.1.0-dev.349 | 2023-08-29 09:11:21 -0700 + + * CI: Add ubuntu 23.04 build (Tim Wojtulewicz, Corelight) + + * CI: Remove EOL ubuntu 22.10 build (Tim Wojtulewicz, Corelight) + 6.1.0-dev.346 | 2023-08-29 09:39:10 +0200 * pre-commit: autoupdate (Arne Welzel, Corelight) diff --git a/VERSION b/VERSION index 3dc1df95b0..02729dae90 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -6.1.0-dev.346 +6.1.0-dev.349 diff --git a/ci/ubuntu-22.10/Dockerfile b/ci/ubuntu-23.04/Dockerfile similarity index 77% rename from ci/ubuntu-22.10/Dockerfile rename to ci/ubuntu-23.04/Dockerfile index cc999f0d14..b468bb9d23 100644 --- a/ci/ubuntu-22.10/Dockerfile +++ b/ci/ubuntu-23.04/Dockerfile @@ -1,10 +1,10 @@ -FROM ubuntu:22.10 +FROM ubuntu:23.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 20230801 +ENV DOCKERFILE_VERSION 20230828 RUN apt-get update && apt-get -y install \ bc \ @@ -17,17 +17,15 @@ RUN apt-get update && apt-get -y install \ g++ \ gcc \ git \ - lcov \ libkrb5-dev \ libmaxminddb-dev \ - libnode-dev \ libpcap-dev \ libssl-dev \ - libuv1-dev \ make \ python3 \ python3-dev \ - python3-pip\ + python3-pip \ + python3-websockets \ ruby \ sqlite3 \ swig \ @@ -37,5 +35,4 @@ RUN apt-get update && apt-get -y install \ && apt autoclean \ && rm -rf /var/lib/apt/lists/* -RUN pip3 install websockets junit2html -RUN gem install coveralls-lcov +RUN pip3 install --break-system-packages junit2html