From: Ilya Shipitsin <chipitsine@gmail.com>
Date: Fri, 19 Apr 2024 05:16:45 +0000 (+0200)
Subject: CI: modernize macos matrix
X-Git-Tag: v3.0-dev8~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=76f56a39bedd8285801e14daf022d4c22ab4036f;p=thirdparty%2Fhaproxy.git

CI: modernize macos matrix

let's stick to macos-13 for stable branches and macos-14 for development branches.
since macos-14 is available for Apple Silicon, some modifications are required
for VTest (should be ported to VTest later)

news: https://github.blog/changelog/2024-01-30-github-actions-macos-14-sonoma-is-now-available/
---

diff --git a/.github/matrix.py b/.github/matrix.py
index 571eddf08d..9300d325b4 100755
--- a/.github/matrix.py
+++ b/.github/matrix.py
@@ -231,9 +231,9 @@ def main(ref_name):
     # macOS
 
     if "haproxy-" in ref_name:
-        os = "macos-12"     # stable branch
+        os = "macos-13"     # stable branch
     else:
-        os = "macos-latest" # development branch
+        os = "macos-14"     # development branch
 
     TARGET = "osx"
     for CC in ["clang"]:
diff --git a/scripts/build-vtest.sh b/scripts/build-vtest.sh
index 4db35d6ee9..f53d2e467e 100755
--- a/scripts/build-vtest.sh
+++ b/scripts/build-vtest.sh
@@ -6,5 +6,12 @@ curl -fsSL https://github.com/vtest/VTest/archive/master.tar.gz -o VTest.tar.gz
 mkdir ../vtest
 tar xvf VTest.tar.gz -C ../vtest --strip-components=1
 # Special flags due to: https://github.com/vtest/VTest/issues/12
-make -C ../vtest FLAGS="-O2 -s -Wall"
 
+#
+# temporarily detect Apple Silicon (it's using /opt/homebrew instead of /usr/local)
+#
+if test -f /opt/homebrew/include/pcre2.h; then
+   make -C ../vtest FLAGS="-O2 -s -Wall" INCS="-Isrc -Ilib -I/usr/local/include -I/opt/homebrew/include -pthread"
+else
+   make -C ../vtest FLAGS="-O2 -s -Wall"
+fi