Merge branch 'topic/christian/ci-updates'

* topic/christian/ci-updates:
  CI: update FreeBSD 13 to 13.3
  CI: add Opensuse Leap 15.6
  CI: remove Centos Stream 8
  CI: add Fedora 40, drop 38

.cirrus.yml

@@ -81,17 +81,17 @@ env:
 # Linux EOL timelines: https://linuxlifecycle.com/
 # Fedora (~13 months): https://fedoraproject.org/wiki/Fedora_Release_Life_Cycle
 
-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
 
-fedora38_task:
+fedora39_task:
   container:
-    # Fedora 38 EOL: Around May 2024
-    dockerfile: ci/fedora-38/Dockerfile
+    # Fedora 39 EOL: Around Nov 2024
+    dockerfile: ci/fedora-39/Dockerfile
     << : *RESOURCES_TEMPLATE
   << : *CI_TEMPLATE
   << : *SKIP_TASK_ON_PR
@@ -103,14 +103,6 @@ centosstream9_task:
     << : *RESOURCES_TEMPLATE
   << : *CI_TEMPLATE
 
-centosstream8_task:
-  container:
-    # Stream 8 EOL: May 31, 2024
-    dockerfile: ci/centos-stream-8/Dockerfile
-    << : *RESOURCES_TEMPLATE
-  << : *CI_TEMPLATE
-  << : *SKIP_TASK_ON_PR
-
 debian12_task:
   container:
     # Debian 12 EOL: TBD
@@ -134,12 +126,20 @@ debian11_static_task:
   << : *CI_TEMPLATE
   << : *SKIP_TASK_ON_PR
 
+opensuse_leap_15_6_task:
+  container:
+    # Opensuse Leap 15.6 EOL: ~Dec 2025
+    dockerfile: ci/opensuse-leap-15.6/Dockerfile
+    << : *RESOURCES_TEMPLATE
+  << : *CI_TEMPLATE
+
 opensuse_leap_15_5_task:
   container:
-    # Opensuse Leap 15.5 EOL: Around Dec 25
+    # 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:
@@ -211,7 +211,7 @@ freebsd14_task:
 freebsd13_task:
   freebsd_instance:
     # FreeBSD 13 EOL: January 31, 2026
-    image_family: freebsd-13-2
+    image_family: freebsd-13-3
     << : *FREEBSD_RESOURCES_TEMPLATE
 
   prepare_script: ./ci/freebsd/prepare.sh

CHANGES

@@ -1,3 +1,13 @@
+0.61.0-28 | 2024-05-28 15:24:22 -0700
+
+  * CI: update FreeBSD 13 to 13.3 (Christian Kreibich, Corelight)
+
+  * CI: add Opensuse Leap 15.6 (Christian Kreibich, Corelight)
+
+  * CI: remove Centos Stream 8 (Christian Kreibich, Corelight)
+
+  * CI: add Fedora 40, drop 38 (Christian Kreibich, Corelight)
+
 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)

README

@@ -1,7 +1,7 @@
 ..	-*- mode: rst-mode -*-
 ..
 .. Version number is filled in automatically.
-.. |version| replace:: 0.61.0-23
+.. |version| replace:: 0.61.0-28
 
 ======
 BinPAC

VERSION

@@ -1 +1 @@
-0.61.0-23
+0.61.0-28

ci/fedora-38/Dockerfile → ci/fedora-40/Dockerfile

@@ -1,8 +1,8 @@
-FROM fedora:38
+FROM fedora:40
 
 # 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
+ENV DOCKERFILE_VERSION 20240524
 
 RUN dnf -y install \
     bison \

ci/opensuse-leap-15.6/Dockerfile

@@ -0,0 +1,20 @@
+FROM opensuse/leap:15.6
+
+# 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 20240524
+
+RUN zypper addrepo https://download.opensuse.org/repositories/openSUSE:Leap:15.6:Update/standard/openSUSE:Leap:15.6: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