Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-16 05:28:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge remote-tracking branch 'origin/topic/timw/remove-ubuntu-22-10'

Browse source 
* origin/topic/timw/remove-ubuntu-22-10:
  CI: Add ubuntu 23.04 build
  CI: Remove EOL ubuntu 22.10 build
This commit is contained in:
Tim Wojtulewicz 2023-08-29 09:11:21 -07:00
commit 619113f674
4 changed files with 15 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
.cirrus.yml
View file

@ -260,10 +260,10 @@ opensuse_tumbleweed_task:
<< : *CI_TEMPLATE << : *CI_TEMPLATE
# << : *SKIP_TASK_ON_PR # << : *SKIP_TASK_ON_PR
ubuntu2210_task: ubuntu23_task:
container: container:
# Ubuntu 22.10 EOL: July 2023 # Ubuntu 23.04 EOL: January 2024
dockerfile: ci/ubuntu-22.10/Dockerfile dockerfile: ci/ubuntu-23.04/Dockerfile
<< : *RESOURCES_TEMPLATE << : *RESOURCES_TEMPLATE
<< : *CI_TEMPLATE << : *CI_TEMPLATE

6
CHANGES
View file

@ -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 6.1.0-dev.346 | 2023-08-29 09:39:10 +0200
* pre-commit: autoupdate (Arne Welzel, Corelight) * pre-commit: autoupdate (Arne Welzel, Corelight)

2
VERSION
View file

@ -1 +1 @@
6.1.0-dev.346 6.1.0-dev.349

13
ci/ubuntu-22.10/Dockerfile → ci/ubuntu-23.04/Dockerfile
View file

@ -1,10 +1,10 @@
FROM ubuntu:22.10 FROM ubuntu:23.04
ENV DEBIAN_FRONTEND="noninteractive" TZ="America/Los_Angeles" ENV DEBIAN_FRONTEND="noninteractive" TZ="America/Los_Angeles"
# A version field to invalidate Cirrus's build cache when needed, as suggested in # 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 # 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 \ RUN apt-get update && apt-get -y install \
bc \ bc \
@ -17,17 +17,15 @@ RUN apt-get update && apt-get -y install \
g++ \ g++ \
gcc \ gcc \
git \ git \
lcov \
libkrb5-dev \ libkrb5-dev \
libmaxminddb-dev \ libmaxminddb-dev \
libnode-dev \
libpcap-dev \ libpcap-dev \
libssl-dev \ libssl-dev \
libuv1-dev \
make \ make \
python3 \ python3 \
python3-dev \ python3-dev \
python3-pip\ python3-pip \
python3-websockets \
ruby \ ruby \
sqlite3 \ sqlite3 \
swig \ swig \
@ -37,5 +35,4 @@ RUN apt-get update && apt-get -y install \
&& apt autoclean \ && apt autoclean \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
RUN pip3 install websockets junit2html RUN pip3 install --break-system-packages junit2html
RUN gem install coveralls-lcov