From bcdfa82651f3555af9bbc335818ab16e8b1a0226 Mon Sep 17 00:00:00 2001
From: scribam <scribam@users.noreply.github.com>
Date: Sat, 27 Dec 2025 13:10:07 +0100
Subject: [PATCH] Add Haiku and update GitHub Actions

---
 .github/workflows/c-cpp.yml                  |  2 +-
 .github/workflows/cross-platform-actions.yml | 24 ++++++++++++--------
 .github/workflows/msys2.yml                  |  2 +-
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
index 759aafa6..638e5a8d 100644
--- a/.github/workflows/c-cpp.yml
+++ b/.github/workflows/c-cpp.yml
@@ -11,7 +11,7 @@ jobs:
         os: [ macos-latest, ubuntu-24.04-arm, ubuntu-latest ]
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - run: make
       - name: Unit tests
         run: |
diff --git a/.github/workflows/cross-platform-actions.yml b/.github/workflows/cross-platform-actions.yml
index 38831d92..a3a4372d 100644
--- a/.github/workflows/cross-platform-actions.yml
+++ b/.github/workflows/cross-platform-actions.yml
@@ -1,4 +1,4 @@
-name: BSD CI
+name: BSD, Haiku CI
 
 on: [push, pull_request]
 
@@ -7,27 +7,33 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        operating_system: [ freebsd, netbsd, openbsd ]
+        operating_system: [ freebsd, haiku, netbsd, openbsd ]
         architecture: [ arm64, x86-64 ]
         include:
           - operating_system: freebsd
-            version: '14.3'
-            pkginstall: sudo pkg update && sudo pkg install -y gmake
+            version: '15.0'
+            pkginstall: sudo pkg update && sudo pkg install -y gmake && export MAKE=gmake
+          - operating_system: haiku
+            version: 'r1beta5'
+            pkginstall: pkgman refresh
           - operating_system: netbsd
             version: '10.1'
-            pkginstall: sudo pkgin update && sudo pkgin -y install clang gmake
+            pkginstall: sudo pkgin update && sudo pkgin -y install clang gmake && export MAKE=gmake
           - operating_system: openbsd
             version: '7.8'
-            pkginstall: sudo pkg_add -u && sudo pkg_add gmake
+            pkginstall: sudo pkg_add -u && sudo pkg_add gmake && export MAKE=gmake
+        exclude:
+          - operating_system: haiku
+            architecture: arm64
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
 
-      - uses: cross-platform-actions/action@v0.30.0
+      - uses: cross-platform-actions/action@v0.32.0
         with:
           operating_system: ${{ matrix.operating_system }}
           architecture: ${{ matrix.architecture }}
           version: ${{ matrix.version }}
           run: |
             ${{ matrix.pkginstall }}
-            gmake CC=cc
+            ${MAKE:-make} CC=cc
diff --git a/.github/workflows/msys2.yml b/.github/workflows/msys2.yml
index f7e39a5f..12aca50b 100644
--- a/.github/workflows/msys2.yml
+++ b/.github/workflows/msys2.yml
@@ -19,7 +19,7 @@ jobs:
         shell: msys2 {0}
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - uses: msys2/setup-msys2@v2
         with:
           msystem: ${{matrix.sys}}