Skip to content

Commit 8e57901

Browse files
committed
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/
1 parent a7caa14 commit 8e57901

2 files changed

Lines changed: 10 additions & 3 deletions

File tree

.github/matrix.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -231,9 +231,9 @@ def main(ref_name):
231231
# macOS
232232

233233
if "haproxy-" in ref_name:
234-
os = "macos-12" # stable branch
234+
os = "macos-13" # stable branch
235235
else:
236-
os = "macos-latest" # development branch
236+
os = "macos-14" # development branch
237237

238238
TARGET = "osx"
239239
for CC in ["clang"]:

scripts/build-vtest.sh

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,12 @@ curl -fsSL https://github.com/vtest/VTest/archive/master.tar.gz -o VTest.tar.gz
66
mkdir ../vtest
77
tar xvf VTest.tar.gz -C ../vtest --strip-components=1
88
# Special flags due to: https://github.com/vtest/VTest/issues/12
9-
make -C ../vtest FLAGS="-O2 -s -Wall"
109

10+
#
11+
# temporarily detect Apple Silicon (it's using /opt/homebrew instead of /usr/local)
12+
#
13+
if test -f /opt/homebrew/include/pcre2.h; then
14+
make -C ../vtest FLAGS="-O2 -s -Wall" INCS="-Isrc -Ilib -I/usr/local/include -I/opt/homebrew/include -pthread"
15+
else
16+
make -C ../vtest FLAGS="-O2 -s -Wall"
17+
fi

0 commit comments

Comments
 (0)