Skip to content

Commit cb7148f

Browse files
authored
Merge bbc1a87 into 713836b
2 parents 713836b + bbc1a87 commit cb7148f

3 files changed

Lines changed: 8 additions & 8 deletions

File tree

.github/workflows/core_linux_build.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ jobs:
3333

3434
env:
3535
BUILD_DIR: ${{ github.workspace }}/../build-${{ matrix.name }}
36-
CCACHE_DIR: ${{ github.workspace }}/../ccache
3736

3837
steps:
3938
- name: Checkout repository
@@ -53,6 +52,8 @@ jobs:
5352
key: linux-${{ matrix.name }}
5453
max-size: 500M
5554

55+
# Never the socket tests: they bind real listeners and dominate the
56+
# suite's wall-clock. A human asks for them, CI does not.
5657
- name: Configure
5758
run: >
5859
cmake -S . -B "$BUILD_DIR" -G Ninja
@@ -67,8 +68,6 @@ jobs:
6768
-DBUILD_REALMD=1
6869
-DBUILD_AH_SERVICE=1
6970
-DWITH_TESTS=1
70-
# Never the socket tests: they bind real listeners and dominate the
71-
# suite's wall-clock. A human asks for them, CI does not.
7271
-DWITH_NET_TESTS=0
7372
-DSOAP=1
7473
-DSCRIPT_LIB_ELUNA=1

.github/workflows/core_windows_build.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@ jobs:
2323

2424
env:
2525
BUILD_DIR: ${{ github.workspace }}\..\build-msvc
26-
CCACHE_DIR: ${{ github.workspace }}\..\ccache
27-
SCCACHE_DIR: ${{ github.workspace }}\..\sccache
2826

2927
steps:
3028
- name: Checkout repository
@@ -89,6 +87,9 @@ jobs:
8987
echo "OPENSSL_INCLUDE_DIR=$root/include" >> "$GITHUB_ENV"
9088
echo "OPENSSL_CRYPTO_LIBRARY=$root/lib/VC/libcrypto64MT.lib" >> "$GITHUB_ENV"
9189
echo "OPENSSL_SSL_LIBRARY=$root/lib/VC/libssl64MT.lib" >> "$GITHUB_ENV"
90+
# SlProWeb installs provider DLLs beside openssl.exe, while its
91+
# compiled MODULESDIR still names the default installation path.
92+
echo "OPENSSL_MODULES=$root/bin" >> "$GITHUB_ENV"
9293
echo "$root/bin" >> "$GITHUB_PATH"
9394
else
9495
echo "::error::OpenSSL developer libraries not found"
@@ -109,6 +110,8 @@ jobs:
109110
key: windows-msvc
110111
max-size: 500M
111112

113+
# Never the socket tests: they bind real listeners and dominate the
114+
# suite's wall-clock. A human asks for them, CI does not.
112115
- name: Configure
113116
shell: bash
114117
run: >
@@ -123,8 +126,6 @@ jobs:
123126
-DBUILD_REALMD=1
124127
-DBUILD_AH_SERVICE=1
125128
-DWITH_TESTS=1
126-
# Never the socket tests: they bind real listeners and dominate the
127-
# suite's wall-clock. A human asks for them, CI does not.
128129
-DWITH_NET_TESTS=0
129130
-DSOAP=1
130131
-DSCRIPT_LIB_ELUNA=1

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ World of Warcraft, and all related art, images, and lore are copyright [Blizzard
189189
[7]: http://www.cppreference.com/ "C / C++ reference"
190190
[8]: https://github.com/mangos/MaNGOS/blob/master/mangosFamily.md "The MaNGOS family of Icons"
191191
[9]: https://discord.gg/fPxMjHS8xs "Our community hub on Discord"
192-
[10]: https://github.com/mangoszero/server/actions/workflows/core_build.yml "Github Actions - Linux/MAC build status"
192+
[10]: https://github.com/mangoszero/server/actions/workflows/core_linux_build.yml "Github Actions - Linux/MAC build status"
193193
[11]: https://ci.appveyor.com/project/MaNGOS/server-9fytl/history "AppVeyor Scan - Windows build status"
194194
[12]: https://app.codacy.com/gh/mangoszero/server/dashboard "Codacy Code Status"
195195
[13]: https://www.codefactor.io/repository/github/mangoszero/server "Codefactor Code Status"

0 commit comments

Comments
 (0)