From 36a8653c8383288b776c59aba432e95cf8db45a5 Mon Sep 17 00:00:00 2001 From: Anton Popovichenko Date: Sat, 21 Sep 2024 16:37:55 +0200 Subject: [PATCH] fix(CI/macOS): Fix macOS CI dependency installation by updating macOS version. (#19997) * fix(CI/MacOS): Fix MacOS CI dependency installation. * Try to use macos 14 version * Remove brew cleanup and z3 dependency * Adjust readline lib discovery * Update macos supported version in SECURITY.md --- .github/SECURITY.md | 4 ++-- .github/workflows/macos_build.yml | 2 +- apps/ci/mac/ci-compile.sh | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/SECURITY.md b/.github/SECURITY.md index fbabc2817e..7feca2632a 100644 --- a/.github/SECURITY.md +++ b/.github/SECURITY.md @@ -54,8 +54,8 @@ Versions of macOS: | macOS Version | Supported | | ------------- | ------------------ | -| 12 | :white_check_mark: | -| 11 and lower | :red_circle: | +| 14 | :white_check_mark: | +| 12 and lower | :red_circle: | **Note**: We do NOT support any repacks that may or may not have been made based on AzerothCore. This is because they are usually based on older versions and there is no way to know what is in the precompiled binaries. Instead, you should compile your binaries from the AzerothCore source. To get started, read the [Installation Guide](https://www.azerothcore.org/wiki/installation). diff --git a/.github/workflows/macos_build.yml b/.github/workflows/macos_build.yml index 2fb927004e..9e0d1090a6 100644 --- a/.github/workflows/macos_build.yml +++ b/.github/workflows/macos_build.yml @@ -16,7 +16,7 @@ jobs: fail-fast: false matrix: os: - - macos-12 + - macos-14 runs-on: ${{ matrix.os }} name: ${{ matrix.os }} if: | diff --git a/apps/ci/mac/ci-compile.sh b/apps/ci/mac/ci-compile.sh index aebca818f0..79507bc9f3 100755 --- a/apps/ci/mac/ci-compile.sh +++ b/apps/ci/mac/ci-compile.sh @@ -28,8 +28,8 @@ time cmake ../../../ \ -DCMAKE_BUILD_TYPE=Release \ -DMYSQL_ADD_INCLUDE_PATH=$mysql_include_path \ -DMYSQL_LIBRARY=$mysql_lib_path \ --DREADLINE_INCLUDE_DIR=/usr/local/opt/readline/include \ --DREADLINE_LIBRARY=/usr/local/opt/readline/lib/libreadline.dylib \ +-DREADLINE_INCLUDE_DIR=$(brew --prefix readline)/include \ +-DREADLINE_LIBRARY=$(brew --prefix readline)/lib/libreadline.dylib \ -DOPENSSL_INCLUDE_DIR="$OPENSSL_ROOT_DIR/include" \ -DOPENSSL_SSL_LIBRARIES="$OPENSSL_ROOT_DIR/lib/libssl.dylib" \ -DOPENSSL_CRYPTO_LIBRARIES="$OPENSSL_ROOT_DIR/lib/libcrypto.dylib" \