From: Philippe Antoine <pantoine@oisf.net>
Date: Tue, 23 Apr 2024 21:29:19 +0000 (+0200)
Subject: ci: fix macos build
X-Git-Tag: suricata-7.0.6~80
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7d26045cd9eb7b09800bde78c4d863c1f4df58c8;p=thirdparty%2Fsuricata.git

ci: fix macos build

use brew instead of pip
limit the number of jobs for make
set a prefix where we can install
use brew flags for library finding

(cherry picked from commit 47a1502dbb0d9ef43a820c956d0396c83b488e07)
---

diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml
index 5775950940..e4358b45a2 100644
--- a/.github/workflows/builds.yml
+++ b/.github/workflows/builds.yml
@@ -2479,7 +2479,9 @@ jobs:
           libnet \
           libtool \
           libyaml \
+          pyyaml \
           lua \
+          pcre2 \
           pkg-config \
           python \
           rust \
@@ -2487,7 +2489,6 @@ jobs:
       - name: Install cbindgen
         run: cargo install --debug --version 0.24.3 cbindgen
       - run: echo "$HOME/.cargo/bin" >> $GITHUB_PATH
-      - run: pip3 install PyYAML
       - uses: actions/checkout@v3.5.3
       - name: Downloading prep archive
         uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a
@@ -2497,8 +2498,8 @@ jobs:
       - run: tar xvf prep/libhtp.tar.gz
       - run: tar xvf prep/suricata-update.tar.gz
       - run: ./autogen.sh
-      - run: CFLAGS="${DEFAULT_CFLAGS}" ./configure --enable-unittests
-      - run: make -j2
+      - run: CPATH="$HOMEBREW_PREFIX/include:$CPATH" LIBRARY_PATH="$HOMEBREW_PREFIX/lib:$LIBRARY_PATH" PATH="/opt/homebrew/opt/libtool/libexec/gnubin:$PATH" CFLAGS="${DEFAULT_CFLAGS}" ./configure --enable-unittests --prefix="$HOME/.local/"
+      - run: CPATH="$HOMEBREW_PREFIX/include:$CPATH" LIBRARY_PATH="$HOMEBREW_PREFIX/lib:$LIBRARY_PATH" PATH="/opt/homebrew/opt/libtool/libexec/gnubin:$PATH" CFLAGS="${DEFAULT_CFLAGS}" make -j2
       # somehow it gets included by some C++ stdlib header (case unsensitive)
       - run: rm libhtp/VERSION && make check
       - run: tar xf prep/suricata-verify.tar.gz