Merge TrinityCore master to multivendor_master

Author: Rochet2

.circleci/config.yml

@@ -2,7 +2,7 @@ version: 2
 jobs:
   codestyle_and_sql:
     docker:
-      - image: trinitycore/circle-ci:master-base-22.04
+      - image: trinitycore/circle-ci:debian-13-builder
         auth:
           username: $DOCKERHUB_USERNAME
           password: $DOCKERHUB_PASSWORD
@@ -44,7 +44,7 @@ jobs:
             cat sql/updates/hotfixes/master/*.sql | mysql -h 127.0.0.1 -uroot hotfixes
   pch:
     docker:
-      - image: trinitycore/circle-ci:master-base-22.04
+      - image: trinitycore/circle-ci:debian-13-builder
         auth:
           username: $DOCKERHUB_USERNAME
           password: $DOCKERHUB_PASSWORD
@@ -91,7 +91,7 @@ jobs:
             docker build --file Dockerfile --force-rm --tag $image_prefix:$CIRCLE_SHA1 --tag $image_prefix:$(echo $CIRCLE_BRANCH | tr '/' '-' | tr '[:upper:]' '[:lower:]') .
             docker save $image_prefix | gzip > ../../docker.tar.gz
             if [ "$DOCKERHUB_PUSH_IMAGES" == "TRUE" ]; then
-              if [ "$CIRCLE_BRANCH" == "3.3.5" ] || [ "$CIRCLE_BRANCH" == "master" ] || [ "$CIRCLE_BRANCH" == "wotlk_classic" ]; then
+              if [ "$CIRCLE_BRANCH" == "3.3.5" ] || [ "$CIRCLE_BRANCH" == "master" ]; then
                 docker login -u $DOCKERHUB_USERNAME -p $DOCKERHUB_PASSWORD
                 echo "Pushing docker image to dockerhub"
                 docker push --all-tags $image_prefix
@@ -101,7 +101,7 @@ jobs:
           path: docker.tar.gz
   nopch:
     docker:
-      - image: trinitycore/circle-ci:master-base-22.04
+      - image: trinitycore/circle-ci:debian-13-builder
         auth:
           username: $DOCKERHUB_USERNAME
           password: $DOCKERHUB_PASSWORD
@@ -135,7 +135,7 @@ jobs:
             ccache -s
             git config user.email "circleci@build.bot" && git config user.name "Circle CI"
             $CXX --version
-            cmake -S . -B ./bin -DWITH_WARNINGS=1 -DWITH_WARNINGS_AS_ERRORS=1 -DWITH_COREDEBUG=0 -DUSE_COREPCH=0 -DUSE_SCRIPTPCH=0 -DTOOLS=1 -DSCRIPTS=dynamic -DSERVERS=1 -DNOJEM=0 -DCMAKE_C_FLAGS_DEBUG="-DNDEBUG" -DCMAKE_CXX_FLAGS_DEBUG="-DNDEBUG" -DCMAKE_INSTALL_PREFIX=bin/check_install
+            cmake -S . -B ./bin -DWITH_WARNINGS=1 -DWITH_WARNINGS_AS_ERRORS=1 -DWITH_COREDEBUG=0 -DUSE_COREPCH=0 -DUSE_SCRIPTPCH=0 -DTOOLS=1 -DSCRIPTS=dynamic -DSERVERS=1 -DNOJEM=0 -DCMAKE_C_FLAGS_DEBUG="-DNDEBUG -g0" -DCMAKE_CXX_FLAGS_DEBUG="-DNDEBUG -g0" -DCMAKE_INSTALL_PREFIX=bin/check_install
       - run:
           name: Build
           command: |
@@ -155,4 +155,3 @@ workflows:
     jobs:
       - codestyle_and_sql
       - pch
-      - nopch

.github/ISSUE_TEMPLATE/sql_fix.yml

@@ -36,7 +36,10 @@ body:
     id: fix
     attributes:
       label: SQL fix
-      description: This field will be formatted automatically as SQL code block, no need to include \`\`\`sql
+      description: |
+        This field will be formatted automatically as SQL code block, no need to include \`\`\`sql
+
+        For large sql fixes please use https://gist.github.com/ then just paste the provided link in the following field.
       placeholder: |
         --
       render: sql

.github/workflows/gcc-build.yml

@@ -0,0 +1,78 @@
+name: Ubuntu x64
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  build:
+    runs-on: ubuntu-24.04
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - cc: gcc-13
+            cxx: g++-13
+            pch: 1
+            launcher: 
+          - cc: clang-17
+            cxx: clang++-17
+            pch: 1
+            launcher: 
+          - cc: clang-17
+            cxx: clang++-17
+            pch: 0
+            launcher: ccache
+    steps:
+    - uses: actions/checkout@v5
+    - name: Set reusable strings
+      id: strings
+      shell: bash
+      run: |
+        echo "build-start=$EPOCHSECONDS" >> "$GITHUB_OUTPUT"
+        echo "build-output-dir=${{ github.workspace }}/bin" >> "$GITHUB_OUTPUT"
+        echo "ccache-key-prefix=ubuntu-${{ matrix.cc }}-${{ github.base_ref || github.ref_name }}" >> "$GITHUB_OUTPUT"
+    - name: Dependencies
+      run: |
+        sudo apt-get update && sudo apt-get install -yq ccache libboost-dev libboost-filesystem-dev libboost-locale-dev libboost-program-options-dev libboost-regex-dev libboost-thread-dev libssl-dev libreadline-dev zlib1g-dev libbz2-dev
+    - name: Restore nopch cache
+      id: ccache-restore
+      if: ${{ matrix.pch == '0' }}
+      uses: actions/cache@v4
+      with:
+        path: ${{ github.workspace }}/.ccache
+        key: ${{ steps.strings.outputs.ccache-key-prefix }}-${{ github.ref_name }}-${{ github.sha }}
+        restore-keys: |
+          ${{ steps.strings.outputs.ccache-key-prefix }}-${{ github.ref_name }}-
+          ${{ steps.strings.outputs.ccache-key-prefix }}-
+    - name: Setup
+      env:
+        CMAKE_BUILD_TYPE: Debug
+        CMAKE_C_COMPILER_LAUNCHER: ${{ matrix.launcher }}
+        CMAKE_CXX_COMPILER_LAUNCHER: ${{ matrix.launcher }}
+        CC: /usr/bin/${{ matrix.cc }}
+        CXX: /usr/bin/${{ matrix.cxx }}
+      run: >
+        cmake -GNinja -S ${{ github.workspace }} -B ${{ steps.strings.outputs.build-output-dir }}
+        -DWITH_WARNINGS=1 -DWITH_WARNINGS_AS_ERRORS=1 -DWITH_COREDEBUG=0 -DUSE_COREPCH=${{ matrix.pch }} -DUSE_SCRIPTPCH=${{ matrix.pch }} -DTOOLS=1 -DSCRIPTS=dynamic -DSERVERS=1 -DNOJEM=0
+        -DCMAKE_C_FLAGS_DEBUG="-DNDEBUG -g0" -DCMAKE_CXX_FLAGS_DEBUG="-DNDEBUG -g0"
+        -DCMAKE_INSTALL_PREFIX=check_install -DBUILD_TESTING=1
+    - name: Build
+      env:
+        CCACHE_BASEDIR: ${{ github.workspace }}
+        CCACHE_DIR: ${{ github.workspace }}/.ccache
+        CCACHE_CPP2: 1
+      run: |
+        ccache -z
+        cmake --build ${{ steps.strings.outputs.build-output-dir }}
+        ccache -s
+        ccache --evict-older-than $(($EPOCHSECONDS - ${{ steps.strings.outputs.build-start }}))s
+    - name: Unit tests
+      run: |
+        cmake --build ${{ steps.strings.outputs.build-output-dir }} --target test
+    - name: Check executables
+      run: |
+        cmake --install ${{ steps.strings.outputs.build-output-dir }}
+        cd ${{ github.workspace }}/check_install/bin
+        ./bnetserver --version
+        ./worldserver --version

.github/workflows/linux-build.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: macos-14
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
 
     - name: Set reusable strings
       id: strings
@@ -23,7 +23,9 @@ jobs:
       run: |
         brew update
         brew uninstall openssl@1.1
-        brew install mysql openssl readline cmake boost coreutils ninja
+        for pkg in mysql openssl readline cmake boost coreutils ninja; do
+          brew ls --versions $pkg || brew install $pkg
+        done
         brew config
 
     - name: Check some deps

.github/workflows/macos-arm-build.yml

@@ -12,7 +12,7 @@ jobs:
       MYSQL_ROOT_DIR: C:/Program Files/MySQL/MySQL Server 8.0
       OPENSSL_ROOT_DIR: C:/libs/openssl
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
 
     - name: Set reusable strings
       id: strings
@@ -56,7 +56,7 @@ jobs:
         & ${{ env.OPENSSL_ROOT_DIR }}/bin/openssl.exe version
 
     - name: Download and install Boost
-      uses: MarkusJx/install-boost@v2.4.5
+      uses: MarkusJx/install-boost@v2
       id: install-boost
       with:
         boost_version: 1.84.0
@@ -84,10 +84,10 @@ jobs:
       run: |
         cd ${{ steps.strings.outputs.build-output-dir }}/bin/${{ env.CMAKE_BUILD_TYPE }}
         copy "${{ env.MYSQL_ROOT_DIR }}/lib/libmysql.dll" libmysql.dll
-        copy "${{ env.OPENSSL_ROOT_DIR }}/bin/libssl-3-x64.dll" libssl-3-x64.dll
-        copy "${{ env.OPENSSL_ROOT_DIR }}/bin/libcrypto-3-x64.dll" libcrypto-3-x64.dll
-        copy "${{ env.OPENSSL_ROOT_DIR }}/bin/legacy.dll" legacy.dll
-      
+        # mysql may depend on a different version of openssl so copy its dlls first (override later with openssl's own if same version)
+        Copy-Item -Path "${{ env.MYSQL_ROOT_DIR }}/bin/*" -Include libcrypto*,libssl* -Destination .
+        Copy-Item -Path "${{ env.OPENSSL_ROOT_DIR }}/bin/*" -Include libcrypto*,libssl*,legacy* -Destination .
+
     - name: Check binaries
       run: |
         cd ${{ steps.strings.outputs.build-output-dir }}/bin/${{ env.CMAKE_BUILD_TYPE }}

.github/workflows/win-x64-build.yml

@@ -4,7 +4,7 @@ clone_depth: 1
 init:
 - ps: ''
 environment:
-  BOOST_ROOT: C:\Libraries\boost_1_83_0
+  BOOST_ROOT: C:\Libraries\boost_1_85_0
   MYSQL_ROOT_DIR: C:\Program Files\MySQL\MySQL Server 8.0
   OPENSSL_ROOT_DIR: C:\OpenSSL-v32-Win64
 build_script:

appveyor.yml

@@ -5,6 +5,9 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "AppleClang")
   # apple doesnt like to do the sane thing which would be to use the same version numbering as regular clang
   # version number pulled from https://en.wikipedia.org/wiki/Xcode#Toolchain_versions for row matching LLVM 11
   set(CLANG_EXPECTED_VERSION 12.0.5)
+  # enable -fpch-instantiate-templates for AppleClang (by default it is active only for regular clang)
+  set(CMAKE_C_COMPILE_OPTIONS_INSTANTIATE_TEMPLATES_PCH -fpch-instantiate-templates)
+  set(CMAKE_CXX_COMPILE_OPTIONS_INSTANTIATE_TEMPLATES_PCH -fpch-instantiate-templates)
 endif()
 
 if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS CLANG_EXPECTED_VERSION)
@@ -57,9 +60,9 @@ endif()
 if(WITH_COREDEBUG)
   target_compile_options(trinity-compile-option-interface
     INTERFACE
-      -g3)
+      -g3 -glldb)
 
-  message(STATUS "Clang: Debug-flags set (-g3)")
+  message(STATUS "Clang: Debug-flags set (-g3 -glldb)")
 endif()
 
 if(ASAN)
@@ -160,13 +163,3 @@ if(BUILD_SHARED_LIBS)
 
   message(STATUS "Clang: Disallow undefined symbols")
 endif()
-
-# speedup PCH builds by forcing template instantiations during PCH generation
-set(CMAKE_REQUIRED_FLAGS "-fpch-instantiate-templates")
-check_cxx_source_compiles("int main() { return 0; }" CLANG_HAS_PCH_INSTANTIATE_TEMPLATES)
-unset(CMAKE_REQUIRED_FLAGS)
-if(CLANG_HAS_PCH_INSTANTIATE_TEMPLATES)
-  target_compile_options(trinity-compile-option-interface
-    INTERFACE
-      -fpch-instantiate-templates)
-endif()

cmake/compiler/clang/settings.cmake

@@ -44,9 +44,9 @@ endif()
 if(WITH_COREDEBUG)
   target_compile_options(trinity-compile-option-interface
     INTERFACE
-      -g3)
+      -ggdb3)
 
-  message(STATUS "GCC: Debug-flags set (-g3)")
+  message(STATUS "GCC: Debug-flags set (-ggdb3)")
 endif()
 
 if(ASAN)

cmake/compiler/gcc/settings.cmake

@@ -26,7 +26,8 @@ target_compile_options(trinity-warning-interface
 # disable permissive mode to make msvc more eager to reject code that other compilers don't already accept
 target_compile_options(trinity-compile-option-interface
   INTERFACE
-    /permissive-)
+    /permissive-
+    /utf-8)
 
 if(PLATFORM EQUAL 32)
   # mark 32 bit executables large address aware so they can use > 2GB address space
@@ -47,7 +48,7 @@ if("${CMAKE_MAKE_PROGRAM}" MATCHES "MSBuild")
   target_compile_options(trinity-compile-option-interface
     INTERFACE
       /MP)
-else()
+elseif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
   # Forces writes to the PDB file to be serialized through mspdbsrv.exe (/FS)
   # Enable faster PDB generation in parallel builds by minimizing RPC calls to mspdbsrv.exe (/Zf)
   target_compile_options(trinity-compile-option-interface
@@ -65,14 +66,12 @@ if((PLATFORM EQUAL 64) OR (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19.0.2302
 endif()
 
 if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
-  # /Zc:throwingNew.
-  # When you specify Zc:throwingNew on the command line, it instructs the compiler to assume
-  # that the program will eventually be linked with a conforming operator new implementation,
-  # and can omit all of these extra null checks from your program.
-  # http://blogs.msdn.com/b/vcblog/archive/2015/08/06/new-in-vs-2015-zc-throwingnew.aspx
   target_compile_options(trinity-compile-option-interface
     INTERFACE
-      /Zc:throwingNew)
+      /Zc:__cplusplus   # Enable updated __cplusplus macro value
+      /Zc:preprocessor  # Enable preprocessor conformance mode
+      /Zc:templateScope # Check template parameter shadowing
+      /Zc:throwingNew)  # Assume operator new throws
 endif()
 
 # Define _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES - eliminates the warning by changing the strcpy call to strcpy_s, which prevents buffer overruns
@@ -127,14 +126,15 @@ if(BUILD_SHARED_LIBS)
   message(STATUS "MSVC: Enabled shared linking")
 endif()
 
-# Move some warnings that are enabled for other compilers from level 4 to level 3
+# Move some warnings that are enabled for other compilers from level 4 to level 3 and enable some warnings which are off by default
 target_compile_options(trinity-compile-option-interface
   INTERFACE
-    /w34100  # C4100 'identifier' : unreferenced formal parameter
+    /w15038  # C5038: data member 'member1' will be initialized after data member 'member2'
+    /w34100  # C4100: 'identifier' : unreferenced formal parameter
     /w34101  # C4101: 'identifier' : unreferenced local variable
     /w34189  # C4189: 'identifier' : local variable is initialized but not referenced
     /w34389  # C4389: 'equality-operator' : signed/unsigned mismatch
-	/w35054) # C5054: 'operator 'operator-name': deprecated between enumerations of different types'
+    /w35054) # C5054: 'operator 'operator-name': deprecated between enumerations of different types'
 
 # Enable and treat as errors the following warnings to easily detect virtual function signature failures:
 # 'function' : member function does not override any base class virtual member function