]> git.ipfire.org Git - thirdparty/rspamd.git/commitdiff
[Feature] Fix BSD workflow package installation and update OS versions vstakhov-new-build-workflows
authorVsevolod Stakhov <vsevolod@rspamd.com>
Tue, 4 Nov 2025 13:02:12 +0000 (13:02 +0000)
committerVsevolod Stakhov <vsevolod@rspamd.com>
Tue, 4 Nov 2025 13:02:12 +0000 (13:02 +0000)
- FreeBSD: Add IGNORE_OSVERSION=yes to handle package version mismatches, update to 14.3/13.5
- OpenBSD: Set PKG_PATH for package repository, fix perl package name, update to 7.8/7.7/7.6
- Use latest stable versions of both operating systems

.github/workflows/freebsd_build.yml
.github/workflows/openbsd_build.yml

index e53b1d54186f19fcbb4bedde6881fdad92e4248c..ce1c08c2b339309f513a6eea9887518f8f25966e 100644 (file)
@@ -8,12 +8,11 @@ on:
       freebsd_version:
         description: 'FreeBSD version to use'
         required: false
-        default: '14.2'
+        default: '14.3'
         type: choice
         options:
-          - '14.2'
-          - '13.4'
-          - '13.3'
+          - '14.3'
+          - '13.5'
       lua_version:
         description: 'Lua version to use'
         required: false
@@ -40,6 +39,9 @@ jobs:
           release: ${{ inputs.freebsd_version }}
           usesh: true
           prepare: |
+            # Ignore OS version mismatch between pkg repository and running system
+            export IGNORE_OSVERSION=yes
+
             # Update package repository
             pkg update -f
 
index 94b468e8aef690cf35e1a2ea6ae051c56cd1c973..01dd5c895bc50f60947061958b03d836428eb220 100644 (file)
@@ -8,12 +8,12 @@ on:
       openbsd_version:
         description: 'OpenBSD version to use'
         required: false
-        default: '7.6'
+        default: '7.8'
         type: choice
         options:
+          - '7.8'
+          - '7.7'
           - '7.6'
-          - '7.5'
-          - '7.4'
       lua_version:
         description: 'Lua version to use'
         required: false
@@ -39,11 +39,14 @@ jobs:
           release: ${{ inputs.openbsd_version }}
           usesh: true
           prepare: |
+            # Set package repository path
+            export PKG_PATH=https://cdn.openbsd.org/pub/OpenBSD/$(uname -r)/packages/$(uname -m)/
+
             # Install base build dependencies
             pkg_add cmake ninja pkgconf \
               pcre2 sqlite3 openssl ragel icu4c \
               libsodium glib2 libunwind \
-              perl-5 libarchive zstd xxhash \
+              perl libarchive zstd xxhash \
               hyperscan file gettext-tools
 
             # Install Lua version based on user selection