diff options
| author | Kitzunu <24550914+Kitzunu@users.noreply.github.com> | 2023-09-15 02:32:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-15 02:32:52 +0200 |
| commit | 5d128d38ea98c325422d0c81e56d7743557216d0 (patch) | |
| tree | 34876e3b812d232728b49cd5652b8ad414d2aad0 | |
| parent | ecf85a2f3e5b84b46c749abfd4e9f861c09ce435 (diff) | |
chore(CI): Update deps for Windows and Mac builds (#17252)
* chore(CI): Update deps for Windows and Mac builds
* Update windows.sh
* Update windows.sh
| -rw-r--r-- | .github/workflows/windows_build.yml | 2 | ||||
| -rw-r--r-- | apps/compiler/includes/functions.sh | 2 | ||||
| -rw-r--r-- | apps/installer/includes/os_configs/osx.sh | 2 | ||||
| -rw-r--r-- | apps/installer/includes/os_configs/windows.sh | 7 |
4 files changed, 7 insertions, 6 deletions
diff --git a/.github/workflows/windows_build.yml b/.github/workflows/windows_build.yml index 22f09f5c3f..082155b432 100644 --- a/.github/workflows/windows_build.yml +++ b/.github/workflows/windows_build.yml @@ -19,7 +19,7 @@ jobs: runs-on: ${{ matrix.os }} name: ${{ matrix.os }} env: - BOOST_ROOT: C:\local\boost_1_79_0 + BOOST_ROOT: C:\local\boost_1_82_0 if: | github.repository == 'azerothcore/azerothcore-wotlk' && !github.event.pull_request.draft diff --git a/apps/compiler/includes/functions.sh b/apps/compiler/includes/functions.sh index 5929816f92..2e7299905c 100644 --- a/apps/compiler/includes/functions.sh +++ b/apps/compiler/includes/functions.sh @@ -73,7 +73,7 @@ function comp_configure() { echo "Platform: $OSTYPE" case "$OSTYPE" in darwin*) - OSOPTIONS=" -DMYSQL_ADD_INCLUDE_PATH=/usr/local/include -DMYSQL_LIBRARY=/usr/local/lib/libmysqlclient.dylib -DREADLINE_INCLUDE_DIR=/usr/local/opt/readline/include -DREADLINE_LIBRARY=/usr/local/opt/readline/lib/libreadline.dylib -DOPENSSL_INCLUDE_DIR=/usr/local/opt/openssl@1.1/include -DOPENSSL_SSL_LIBRARIES=/usr/local/opt/openssl@1.1/lib/libssl.dylib -DOPENSSL_CRYPTO_LIBRARIES=/usr/local/opt/openssl@1.1/lib/libcrypto.dylib " + OSOPTIONS=" -DMYSQL_ADD_INCLUDE_PATH=/usr/local/include -DMYSQL_LIBRARY=/usr/local/lib/libmysqlclient.dylib -DREADLINE_INCLUDE_DIR=/usr/local/opt/readline/include -DREADLINE_LIBRARY=/usr/local/opt/readline/lib/libreadline.dylib -DOPENSSL_INCLUDE_DIR=/usr/local/opt/openssl@3/include -DOPENSSL_SSL_LIBRARIES=/usr/local/opt/openssl@3/lib/libssl.dylib -DOPENSSL_CRYPTO_LIBRARIES=/usr/local/opt/openssl@3/lib/libcrypto.dylib " ;; msys*) OSOPTIONS=" -DMYSQL_INCLUDE_DIR=C:\tools\mysql\current\include -DMYSQL_LIBRARY=C:\tools\mysql\current\lib\mysqlclient.lib " diff --git a/apps/installer/includes/os_configs/osx.sh b/apps/installer/includes/os_configs/osx.sh index d3f762f574..51d868f275 100644 --- a/apps/installer/includes/os_configs/osx.sh +++ b/apps/installer/includes/os_configs/osx.sh @@ -26,4 +26,4 @@ if ! command -v cmake &>/dev/null ; then fi ########################################## -brew install openssl@3 readline boost bash-completion curl unzip mysql ccache +brew install openssl@3 readline boost@1.82 bash-completion curl unzip mysql@8.1 ccache diff --git a/apps/installer/includes/os_configs/windows.sh b/apps/installer/includes/os_configs/windows.sh index 227a0258db..7687739d70 100644 --- a/apps/installer/includes/os_configs/windows.sh +++ b/apps/installer/includes/os_configs/windows.sh @@ -23,7 +23,8 @@ else fi choco install -y --skip-checksums $INSTALL_ARGS cmake.install -y --installargs 'ADD_CMAKE_TO_PATH=System' -choco install -y --skip-checksums $INSTALL_ARGS visualstudio2022-workload-nativedesktop openssl -choco install -y --skip-checksums $INSTALL_ARGS boost-msvc-14.3 --version=1.79.0 -choco install -y --skip-checksums $INSTALL_ARGS mysql --version 8.0.31 +choco install -y --skip-checksums $INSTALL_ARGS visualstudio2022-workload-nativedesktop +choco install -y --skip-checksums $INSTALL_ARGS openssl --version=3.1.1 +choco install -y --skip-checksums $INSTALL_ARGS boost-msvc-14.3 --version=1.82.0 +choco install -y --skip-checksums $INSTALL_ARGS mysql --version=8.0.31 |