RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2024-12-22 12:30:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

CI: modernize macos matrix

Browse Source 
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/
This commit is contained in:
Ilya Shipitsin 2024-04-19 07:16:45 +02:00 committed by Willy Tarreau
parent 865db6307f
commit 76f56a39be
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/matrix.py vendored
View File

@ -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"]:

9
scripts/build-vtest.sh
View File

@ -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