diff --git a/.github/workflows/core_linux_build.yml b/.github/workflows/core_linux_build.yml index 24161c65a..ead192a63 100644 --- a/.github/workflows/core_linux_build.yml +++ b/.github/workflows/core_linux_build.yml @@ -33,7 +33,6 @@ jobs: env: BUILD_DIR: ${{ github.workspace }}/../build-${{ matrix.name }} - CCACHE_DIR: ${{ github.workspace }}/../ccache steps: - name: Checkout repository @@ -53,6 +52,8 @@ jobs: key: linux-${{ matrix.name }} max-size: 500M + # Never the socket tests: they bind real listeners and dominate the + # suite's wall-clock. A human asks for them, CI does not. - name: Configure run: > cmake -S . -B "$BUILD_DIR" -G Ninja @@ -67,8 +68,6 @@ jobs: -DBUILD_REALMD=1 -DBUILD_AH_SERVICE=1 -DWITH_TESTS=1 - # Never the socket tests: they bind real listeners and dominate the - # suite's wall-clock. A human asks for them, CI does not. -DWITH_NET_TESTS=0 -DSOAP=1 -DSCRIPT_LIB_ELUNA=1 diff --git a/.github/workflows/core_windows_build.yml b/.github/workflows/core_windows_build.yml index 2255196f4..258b1e223 100644 --- a/.github/workflows/core_windows_build.yml +++ b/.github/workflows/core_windows_build.yml @@ -23,8 +23,6 @@ jobs: env: BUILD_DIR: ${{ github.workspace }}\..\build-msvc - CCACHE_DIR: ${{ github.workspace }}\..\ccache - SCCACHE_DIR: ${{ github.workspace }}\..\sccache steps: - name: Checkout repository @@ -89,6 +87,9 @@ jobs: echo "OPENSSL_INCLUDE_DIR=$root/include" >> "$GITHUB_ENV" echo "OPENSSL_CRYPTO_LIBRARY=$root/lib/VC/libcrypto64MT.lib" >> "$GITHUB_ENV" echo "OPENSSL_SSL_LIBRARY=$root/lib/VC/libssl64MT.lib" >> "$GITHUB_ENV" + # SlProWeb installs provider DLLs beside openssl.exe, while its + # compiled MODULESDIR still names the default installation path. + echo "OPENSSL_MODULES=$root/bin" >> "$GITHUB_ENV" echo "$root/bin" >> "$GITHUB_PATH" else echo "::error::OpenSSL developer libraries not found" @@ -109,6 +110,8 @@ jobs: key: windows-msvc max-size: 500M + # Never the socket tests: they bind real listeners and dominate the + # suite's wall-clock. A human asks for them, CI does not. - name: Configure shell: bash run: > @@ -123,8 +126,6 @@ jobs: -DBUILD_REALMD=1 -DBUILD_AH_SERVICE=1 -DWITH_TESTS=1 - # Never the socket tests: they bind real listeners and dominate the - # suite's wall-clock. A human asks for them, CI does not. -DWITH_NET_TESTS=0 -DSOAP=1 -DSCRIPT_LIB_ELUNA=1 diff --git a/README.md b/README.md index bdb966f1b..e62d335dd 100644 --- a/README.md +++ b/README.md @@ -189,7 +189,7 @@ World of Warcraft, and all related art, images, and lore are copyright [Blizzard [7]: http://www.cppreference.com/ "C / C++ reference" [8]: https://github.com/mangos/MaNGOS/blob/master/mangosFamily.md "The MaNGOS family of Icons" [9]: https://discord.gg/fPxMjHS8xs "Our community hub on Discord" -[10]: https://github.com/mangoszero/server/actions/workflows/core_build.yml "Github Actions - Linux/MAC build status" +[10]: https://github.com/mangoszero/server/actions/workflows/core_linux_build.yml "Github Actions - Linux/MAC build status" [11]: https://ci.appveyor.com/project/MaNGOS/server-9fytl/history "AppVeyor Scan - Windows build status" [12]: https://app.codacy.com/gh/mangoszero/server/dashboard "Codacy Code Status" [13]: https://www.codefactor.io/repository/github/mangoszero/server "Codefactor Code Status"