From 50220f13a90b8cdf2dfdca1efdab574c2dc1aa6a Mon Sep 17 00:00:00 2001 From: Anton Popovichenko Date: Thu, 19 Sep 2024 20:55:21 +0000 Subject: [PATCH 1/5] fix(CI/MacOS): Fix MacOS CI dependency installation. --- apps/installer/includes/os_configs/osx.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/apps/installer/includes/os_configs/osx.sh b/apps/installer/includes/os_configs/osx.sh index b7c9bc14665c7..d3b2a0c0db844 100644 --- a/apps/installer/includes/os_configs/osx.sh +++ b/apps/installer/includes/os_configs/osx.sh @@ -22,6 +22,8 @@ rm /usr/local/bin/python3.11-config || true rm /usr/local/bin/python3.12-config || true ########################################## +brew cleanup + brew update ########################################## @@ -31,4 +33,4 @@ if ! command -v cmake &>/dev/null ; then fi ########################################## -brew install openssl@3 readline boost bash-completion curl unzip mysql ccache +brew install z3 openssl@3 readline boost bash-completion curl unzip mysql ccache From d5f2e25a3d9e47957d669273fc3d0e31fb6fa373 Mon Sep 17 00:00:00 2001 From: Anton Popovichenko Date: Thu, 19 Sep 2024 21:25:34 +0000 Subject: [PATCH 2/5] Try to use macos 14 version --- .github/workflows/macos_build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/macos_build.yml b/.github/workflows/macos_build.yml index 2fb927004ef78..9e0d1090a6b46 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: | From d4f81f52fdfe40861a504a28cb62fab7a08ae90f Mon Sep 17 00:00:00 2001 From: Anton Popovichenko Date: Thu, 19 Sep 2024 21:29:04 +0000 Subject: [PATCH 3/5] Remove brew cleanup and z3 dependency --- apps/installer/includes/os_configs/osx.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/apps/installer/includes/os_configs/osx.sh b/apps/installer/includes/os_configs/osx.sh index d3b2a0c0db844..b7c9bc14665c7 100644 --- a/apps/installer/includes/os_configs/osx.sh +++ b/apps/installer/includes/os_configs/osx.sh @@ -22,8 +22,6 @@ rm /usr/local/bin/python3.11-config || true rm /usr/local/bin/python3.12-config || true ########################################## -brew cleanup - brew update ########################################## @@ -33,4 +31,4 @@ if ! command -v cmake &>/dev/null ; then fi ########################################## -brew install z3 openssl@3 readline boost bash-completion curl unzip mysql ccache +brew install openssl@3 readline boost bash-completion curl unzip mysql ccache From 12cf6288dc2b6a83161225d050b90bc47b9c236d Mon Sep 17 00:00:00 2001 From: Anton Popovichenko Date: Thu, 19 Sep 2024 21:46:13 +0000 Subject: [PATCH 4/5] Adjust readline lib discovery --- apps/ci/mac/ci-compile.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/ci/mac/ci-compile.sh b/apps/ci/mac/ci-compile.sh index aebca818f026b..79507bc9f3c97 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" \ From 0e48835c18143ffa039cc1745520250397407ccd Mon Sep 17 00:00:00 2001 From: Anton Popovichenko Date: Sat, 21 Sep 2024 14:25:54 +0200 Subject: [PATCH 5/5] Update macos supported version in SECURITY.md --- .github/SECURITY.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/SECURITY.md b/.github/SECURITY.md index fbabc2817ede8..7feca2632ae1d 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).