Merge branch 'topic/bbannier/ci-refresh'

zeek · Feb 7, 2025 · 77ca9af · 77ca9af
2 parents 399d758 + a5b6b73
commit 77ca9af
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 13 deletions.
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -606,11 +606,11 @@ docker_fedora41_task:
     path: ./spicy*.{deb,rpm}
     type: application/gzip
 
-docker_opensuse15_5_task:
+docker_opensuse15_6_task:
   skip: $CIRRUS_BRANCH != 'main' && $CIRRUS_TAG == ''
 
   container:
-    dockerfile: docker/Dockerfile.opensuse-15.5
+    dockerfile: docker/Dockerfile.opensuse-15.6
     cpu: 4
     memory: 12G
 
@@ -644,8 +644,10 @@ docker_opensuse15_5_task:
     type: application/gzip
 
 freebsd13_task:
+  skip: $CIRRUS_BRANCH != 'main' && $CIRRUS_TAG == ''
+
   freebsd_instance:
-    image_family: freebsd-13-3
+    image_family: freebsd-13-4
     cpu: 8
     memory: 8GB
 
@@ -681,7 +683,7 @@ freebsd13_task:
 
 freebsd14_task:
   freebsd_instance:
-    image_family: freebsd-14-0
+    image_family: freebsd-14-2
     cpu: 8
     memory: 8GB
 

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -37,7 +37,7 @@ repos:
     stages: ["pre-commit"]
 
 - repo: https://github.com/pre-commit/mirrors-clang-format
-  rev: 'v19.1.6'
+  rev: 'v19.1.7'
   hooks:
   - id: clang-format
     types_or: ["c", "c++"]
@@ -86,14 +86,14 @@ repos:
     stages: ["pre-commit"]
 
 - repo: https://github.com/crate-ci/typos
-  rev: v1.29.4
+  rev: v1.29.5
   hooks:
   - id: typos
     exclude: 'tests/.*/regexp/.*|.clang-tidy'
 
 - repo: https://github.com/astral-sh/ruff-pre-commit
   # Ruff version.
-  rev: v0.8.6
+  rev: v0.9.4
   hooks:
   - id: ruff
     args: [ --fix ]

diff --git a/CHANGES b/CHANGES
@@ -1,3 +1,15 @@
+1.13.0-dev.81 | 2025-02-07 09:21:54 +0100
+
+  * Drop freebsd-13 from default CI jobs. (Benjamin Bannier, Corelight)
+
+  * Bump pre-commit hooks. (Benjamin Bannier, Corelight)
+
+  * Bump freebsd-14 in CI. (Benjamin Bannier, Corelight)
+
+  * Bump freebsd-13 in CI. (Benjamin Bannier, Corelight)
+
+  * Bump opensuse-15 in CI. (Benjamin Bannier, Corelight)
+
 1.13.0-dev.75 | 2025-01-23 10:29:10 +0100
 
   * Regenerate usage documentation. (Benjamin Bannier, Corelight)

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.13.0-dev.75
+1.13.0-dev.81
diff --git a/doc/scripts/spicy-doc-to-rst b/doc/scripts/spicy-doc-to-rst
@@ -136,7 +136,7 @@ def namespace(ns):
 
 def rstHeading(title, level):
     return "{}\n{}\n".format(title, "==-~"[level] * len(title))
-    return f'{title}\n{"==-~"[level] * len(title)}\n'
+    return f"{title}\n{'==-~'[level] * len(title)}\n"
 
 
 def fmtDoc(doc):

diff --git a/docker/Dockerfile.opensuse-15.5 → docker/Dockerfile.opensuse-15.6 b/docker/Dockerfile.opensuse-15.5 → docker/Dockerfile.opensuse-15.6
@@ -1,8 +1,8 @@
 # Copyright (c) 2020-now by the Zeek Project. See LICENSE for details.
 
-FROM opensuse/leap:15.5
+FROM opensuse/leap:15.6
 
-RUN zypper addrepo https://download.opensuse.org/repositories/openSUSE:Leap:15.2:Update/standard/openSUSE:Leap:15.2:Update.repo \
+RUN zypper addrepo https://download.opensuse.org/repositories/openSUSE:Leap:15.6:Update/standard/openSUSE:Leap:15.6:Update.repo \
  && zypper refresh \
  && zypper install -y \
       bison \
@@ -21,5 +21,5 @@ RUN zypper addrepo https://download.opensuse.org/repositories/openSUSE:Leap:15.2
 
 RUN pip3 install "btest>=0.66" sphinx-rtd-theme diagrams
 
-ENV CXX g++-9
-ENV CC gcc-9
+ENV CXX=g++-9
+ENV CC=gcc-9