Skip to content

Commit

Permalink
Merge branch 'topic/christian/ci-updates'
Browse files Browse the repository at this point in the history
* topic/christian/ci-updates:
  CI: add Ubuntu 24.10
  CI: bump FreeBSD to 14.1 and 13.4, respectively
  CI: drop Fedora 39, add 41
  • Loading branch information
ckreibich committed Dec 6, 2024
2 parents 5647440 + ad5ef87 commit 5c9f59f
Show file tree
Hide file tree
Showing 5 changed files with 45 additions and 11 deletions.
24 changes: 16 additions & 8 deletions .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,18 +63,18 @@ clang_tidy_task:
<< : *UNIX_ENV
<< : *BRANCH_WHITELIST

fedora40_task:
fedora41_task:
container:
# Fedora 40 EOL: Around May 2025
dockerfile: ci/fedora-40/Dockerfile
# Fedora 41 EOL: Around Nov 2025
dockerfile: ci/fedora-41/Dockerfile
<< : *RESOURCES_TEMPLATE
<< : *CI_TEMPLATE
<< : *UNIX_ENV

fedora39_task:
fedora40_task:
container:
# Fedora 39 EOL: Around Nov 2024
dockerfile: ci/fedora-39/Dockerfile
# Fedora 40 EOL: Around May 2025
dockerfile: ci/fedora-40/Dockerfile
<< : *RESOURCES_TEMPLATE
<< : *CI_TEMPLATE
<< : *UNIX_ENV
Expand Down Expand Up @@ -127,6 +127,14 @@ opensuse_tumbleweed_task:
<< : *CI_TEMPLATE
<< : *UNIX_ENV

ubuntu24_10_task:
container:
# Ubuntu 24.10 EOL: 2025-07-30
dockerfile: ci/ubuntu-24.10/Dockerfile
<< : *RESOURCES_TEMPLATE
<< : *CI_TEMPLATE
<< : *UNIX_ENV

ubuntu24_task:
container:
# Ubuntu 24.04 EOL: Jun 2029
Expand Down Expand Up @@ -178,7 +186,7 @@ macos_sonoma_task:
freebsd14_task:
freebsd_instance:
# FreeBSD 14 EOL: Nov 30 2028
image_family: freebsd-14-0
image_family: freebsd-14-1
cpu: 8
# Not allowed to request less than 8GB for an 8 CPU FreeBSD VM.
memory: 8GB
Expand All @@ -189,7 +197,7 @@ freebsd14_task:
freebsd13_task:
freebsd_instance:
# FreeBSD 13 EOL: January 31, 2026
image_family: freebsd-13-3
image_family: freebsd-13-4
cpu: 8
# Not allowed to request less than 8GB for an 8 CPU FreeBSD VM.
memory: 8GB
Expand Down
8 changes: 8 additions & 0 deletions CHANGES
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
2.8.0-dev.150 | 2024-12-06 00:02:47 -0800

* CI: add Ubuntu 24.10 (Christian Kreibich, Corelight)

* CI: bump FreeBSD to 14.1 and 13.4, respectively (Christian Kreibich, Corelight)

* CI: drop Fedora 39, add 41 (Christian Kreibich, Corelight)

2.8.0-dev.146 | 2024-12-04 14:36:30 -0700

* CI: Require python 3.9 on ubuntu 20 (Tim Wojtulewicz, Corelight)
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.8.0-dev.146
2.8.0-dev.150
4 changes: 2 additions & 2 deletions ci/fedora-39/Dockerfile → ci/fedora-41/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
FROM fedora:39
FROM fedora:41

# 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 20241106
ENV DOCKERFILE_VERSION 20241204

RUN dnf -y install \
cmake \
Expand Down
18 changes: 18 additions & 0 deletions ci/ubuntu-24.10/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
FROM ubuntu:24.10

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 20241204

RUN apt-get update && apt-get -y install \
cmake \
g++ \
git \
libssl-dev \
make \
python3 \
python3-dev \
&& apt autoclean \
&& rm -rf /var/lib/apt/lists/*

0 comments on commit 5c9f59f

Please sign in to comment.