Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/topic/timw/ci-ubuntu-24-lts'
Browse files Browse the repository at this point in the history
* origin/topic/timw/ci-ubuntu-24-lts:
  CI: Use macOS Sonoma xcode VM to fix problem with missing tools
  CI: Add Ubuntu 24.04 build
  • Loading branch information
timwoj committed May 14, 2024
2 parents 822cdb5 + 0b63d84 commit da091b5
Show file tree
Hide file tree
Showing 5 changed files with 36 additions and 3 deletions.
9 changes: 8 additions & 1 deletion .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,13 @@ opensuse_tumbleweed_task:
<< : *CI_TEMPLATE
<< : *SKIP_TASK_ON_PR

ubuntu24_task:
container:
# Ubuntu 24.04 EOL: Jun 2029
dockerfile: ci/ubuntu-22.04/Dockerfile
<< : *RESOURCES_TEMPLATE
<< : *CI_TEMPLATE

ubuntu22_task:
container:
# Ubuntu 22.04 EOL: April 2027
Expand Down Expand Up @@ -177,7 +184,7 @@ alpine_task:
# We aim to support both the current and previous macOS release.
macos_sonoma_task:
macos_instance:
image: ghcr.io/cirruslabs/macos-sonoma-base:latest
image: ghcr.io/cirruslabs/macos-sonoma-xcode:latest
prepare_script: ./ci/macos/prepare.sh
<< : *CI_TEMPLATE
<< : *MACOS_ENVIRONMENT
Expand Down
8 changes: 8 additions & 0 deletions CHANGES
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
0.61.0-23 | 2024-05-13 17:38:06 -0700

* CI: Use macOS Sonoma xcode VM to fix problem with missing tools (Tim Wojtulewicz, Corelight)

* CI: Add Ubuntu 24.04 build (Tim Wojtulewicz, Corelight)

* CI: Remove CentOS 7 and Debian 10 builds (Christian Kreibich, Corelight)

0.61.0-18 | 2023-12-14 19:59:32 -0800

* CI updates (Christian Kreibich, Corelight)
Expand Down
2 changes: 1 addition & 1 deletion README
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.. -*- mode: rst-mode -*-
..
.. Version number is filled in automatically.
.. |version| replace:: 0.61.0-18
.. |version| replace:: 0.61.0-23

======
BinPAC
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.61.0-18
0.61.0-23
18 changes: 18 additions & 0 deletions ci/ubuntu-24.04/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
FROM ubuntu:24.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 20240510

RUN apt-get update && apt-get -y install \
bison \
cmake \
flex \
g++ \
gcc \
git \
make \
&& apt autoclean \
&& rm -rf /var/lib/apt/lists/*

0 comments on commit da091b5

Please sign in to comment.