From 37d602b40c8ec8b218d040af65b051390f999493 Mon Sep 17 00:00:00 2001 From: akallabeth Date: Fri, 21 Mar 2025 12:10:20 +0100 Subject: [PATCH] [ci,mac] check for and install meson --- .github/workflows/macos.yml | 2 +- scripts/bundle-mac-os.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 20391d5c0..b83fefd6c 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -15,7 +15,7 @@ jobs: - name: "Prepare environment" run: | - brew install autoconf automake cmake git libtool + brew install autoconf automake cmake git libtool meson - name: "Run mac os build..." run: | diff --git a/scripts/bundle-mac-os.sh b/scripts/bundle-mac-os.sh index 776c92555..8db50124d 100755 --- a/scripts/bundle-mac-os.sh +++ b/scripts/bundle-mac-os.sh @@ -23,7 +23,7 @@ usage() { } check_tools() { - for TOOL in mkdir rm mv git dirname pwd find cut basename grep xargs cmake ninja autoconf automake aclocal autoheader glibtoolize lipo otool install_name_tool; do + for TOOL in mkdir rm mv git dirname pwd find cut basename grep xargs cmake ninja autoconf automake aclocal autoheader glibtoolize lipo otool install_name_tool meson; do set +e TOOL_PATH=$(which "$TOOL") set -e