diff --git a/.cirrus.yml b/.cirrus.yml index 028eddf..f7a8676 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -133,14 +133,6 @@ opensuse_leap_15_6_task: << : *RESOURCES_TEMPLATE << : *CI_TEMPLATE -opensuse_leap_15_5_task: - container: - # Opensuse Leap 15.5 EOL: ~Dec 2024 - dockerfile: ci/opensuse-leap-15.5/Dockerfile - << : *RESOURCES_TEMPLATE - << : *CI_TEMPLATE - << : *SKIP_TASK_ON_PR - opensuse_tumbleweed_task: container: # Opensuse Tumbleweed has no EOL @@ -208,7 +200,7 @@ macos_ventura_task: freebsd14_task: freebsd_instance: # FreeBSD 14 EOL: Nov 30 2028 - image_family: freebsd-14-1 + image_family: freebsd-14-2 << : *FREEBSD_RESOURCES_TEMPLATE prepare_script: ./ci/freebsd/prepare.sh diff --git a/CHANGES b/CHANGES index 365cafc..7728b08 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,11 @@ +0.61.0-42 | 2025-02-07 17:46:08 -0800 + + * CI: bump FreeBSD 14 to 14.2, which came out in Dec'24 (Christian Kreibich, Corelight) + + * CI: remove OpenSuSE Leap 15.5, EOL. (Christian Kreibich, Corelight) + + * Updating submodule(s) [nomail] (Tim Wojtulewicz, Corelight) + 0.61.0-37 | 2024-12-06 00:04:26 -0800 * CI: add Ubuntu 24.10 and actually test 24.04 :-) (Christian Kreibich, Corelight) diff --git a/README b/README index 2f7993a..31dd18d 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ .. -*- mode: rst-mode -*- .. .. Version number is filled in automatically. -.. |version| replace:: 0.61.0-37 +.. |version| replace:: 0.61.0-42 ====== BinPAC diff --git a/VERSION b/VERSION index f72a7bc..94d47a3 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.61.0-37 +0.61.0-42 diff --git a/ci/opensuse-leap-15.5/Dockerfile b/ci/opensuse-leap-15.5/Dockerfile deleted file mode 100644 index 39e7050..0000000 --- a/ci/opensuse-leap-15.5/Dockerfile +++ /dev/null @@ -1,20 +0,0 @@ -FROM opensuse/leap:15.5 - -# 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 20231213 - -RUN zypper addrepo https://download.opensuse.org/repositories/openSUSE:Leap:15.5:Update/standard/openSUSE:Leap:15.5:Update.repo \ - && zypper refresh \ - && zypper in -y \ - bison \ - cmake \ - flex \ - gcc10 \ - gcc10-c++ \ - git \ - make \ - && rm -rf /var/cache/zypp - -RUN update-alternatives --install /usr/bin/cc cc /usr/bin/gcc-10 100 -RUN update-alternatives --install /usr/bin/c++ c++ /usr/bin/g++-10 100