Merge TCore Updates

.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
@@ -56,14 +56,12 @@ jobs:
       - run:
           name: Setup
           command: |
-            mkdir bin
-            cd bin
             if [ "$DOCKERHUB_PUSH_IMAGES" == "TRUE" ]; then
-              cmake ../ -DWITH_WARNINGS=1 -DWITH_COREDEBUG=0 -DUSE_COREPCH=1 -DUSE_SCRIPTPCH=1 -DTOOLS=1 -DSCRIPTS=static -DSERVERS=1 -DNOJEM=0 -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS="-Werror" -DCMAKE_CXX_FLAGS="-Werror" -DCMAKE_INSTALL_PREFIX=check_install -DCMAKE_INSTALL_RPATH=\$ORIGIN/../lib -DBUILD_TESTING=1
+              export CMAKE_BUILD_TYPE=Release
             else
-              cmake ../ -DWITH_WARNINGS=1 -DWITH_COREDEBUG=0 -DUSE_COREPCH=1 -DUSE_SCRIPTPCH=1 -DTOOLS=1 -DSCRIPTS=static -DSERVERS=1 -DNOJEM=0 -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_FLAGS="-Werror" -DCMAKE_CXX_FLAGS="-Werror" -DCMAKE_C_FLAGS_DEBUG="-DNDEBUG" -DCMAKE_CXX_FLAGS_DEBUG="-DNDEBUG" -DCMAKE_INSTALL_PREFIX=check_install -DCMAKE_INSTALL_RPATH=\$ORIGIN/../lib -DBUILD_TESTING=1
+              export CMAKE_BUILD_TYPE=Debug
             fi
-            cd ..
+            cmake -S . -B ./bin -DWITH_WARNINGS=1 -DWITH_WARNINGS_AS_ERRORS=1 -DWITH_COREDEBUG=0 -DUSE_COREPCH=1 -DUSE_SCRIPTPCH=1 -DTOOLS=1 -DSCRIPTS=static -DSERVERS=1 -DNOJEM=0 -DCMAKE_C_FLAGS_DEBUG="-DNDEBUG" -DCMAKE_CXX_FLAGS_DEBUG="-DNDEBUG" -DCMAKE_INSTALL_PREFIX=bin/check_install -DCMAKE_INSTALL_RPATH=\$ORIGIN/../lib -DBUILD_TESTING=1
       - run:
           name: Build
           command: |
@@ -81,7 +79,7 @@ jobs:
             ./bnetserver --version
             ./worldserver --version
       - setup_remote_docker:
-          version: 19.03.13
+          version: default
       - run:
           name: Create docker images
           command: |
@@ -103,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
@@ -128,6 +126,7 @@ jobs:
             export CCACHE_MAXSIZE="1G"
             export CC="ccache clang"
             export CXX="ccache clang++"
+            export CMAKE_BUILD_TYPE=Debug
             export CCACHE_CPP2=yes
             export USE_CCACHE=1
             export PATH=/usr/lib/ccache:$PATH
@@ -136,10 +135,7 @@ jobs:
             ccache -s
             git config user.email "circleci@build.bot" && git config user.name "Circle CI"
             $CXX --version
-            mkdir bin
-            cd bin
-            cmake ../ -DWITH_WARNINGS=1 -DWITH_COREDEBUG=0 -DUSE_COREPCH=0 -DUSE_SCRIPTPCH=0 -DTOOLS=1 -DSCRIPTS=dynamic -DSERVERS=1 -DNOJEM=0 -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_FLAGS="-Werror" -DCMAKE_CXX_FLAGS="-Werror" -DCMAKE_C_FLAGS_DEBUG="-DNDEBUG" -DCMAKE_CXX_FLAGS_DEBUG="-DNDEBUG" -DCMAKE_INSTALL_PREFIX=check_install
-            cd ..
+            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: |
@@ -159,4 +155,3 @@ workflows:
     jobs:
       - codestyle_and_sql
       - pch
-      - nopch

.gitattributes

@@ -29,3 +29,6 @@
 
 # Ignore sql/* files
 sql/*    linguist-documentation
+
+# Always LF endings
+*.sh     eol=lf

.github/ISSUE_TEMPLATE/config.yml

@@ -4,11 +4,11 @@ contact_links:
     url: https://discord.com/invite/3UxRn4Kn?utm_source=Discord%20Widget&utm_medium=Connect
     about: Chat
   - name: How to Compile
-    url: https://trinitycore.atlassian.net/
+    url: https://trinitycore.info/
     about: Wiki
   - name: Community Support Forum
     url: https://community.trinitycore.org/
     about: Forum
   - name: Discussions
     url: https://github.com/TrinityCore/TrinityCore/discussions
-    about: Discuss
+    about: Discuss

.github/ISSUE_TEMPLATE/issue.yml

@@ -39,6 +39,7 @@ body:
       options:
         - 3.3.5
         - master
+        - cata_classic
     validations:
       required: true
   - type: textarea

.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
@@ -49,6 +52,7 @@ body:
       options:
         - 3.3.5
         - master
+        - cata_classic
     validations:
       required: true
   - type: textarea

.github/workflows/linux-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/macos-arm-build.yml

@@ -0,0 +1,65 @@
+name: macOS arm64
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  build:
+    runs-on: macos-14
+
+    steps:
+    - uses: actions/checkout@v5
+
+    - name: Set reusable strings
+      id: strings
+      shell: bash
+      run: |
+        echo "build-output-dir=${{ github.workspace }}/build" >> "$GITHUB_OUTPUT"
+
+    - name: Install/Update requirements
+      env:
+        HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK: 1
+      run: |
+        brew update
+        brew uninstall openssl@1.1
+        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
+      run: |
+        mysql --version
+        openssl version
+
+    - name: Print CPU info
+      run: |
+         echo "Cores: $(nproc), Arch: $(uname -p)"
+
+    - name: Configure CMake
+      env:
+        CMAKE_BUILD_TYPE: Debug
+      run: >
+        cmake -GNinja -B ${{ steps.strings.outputs.build-output-dir }}
+        -DWITH_WARNINGS=1 -DWITH_WARNINGS_AS_ERRORS=1 -DWITH_COREDEBUG=0 -DUSE_COREPCH=1 -DUSE_SCRIPTPCH=1 -DTOOLS=1 -DSCRIPTS=static -DSERVERS=1 -DBUILD_TESTING=1
+        -DCMAKE_C_FLAGS_DEBUG="-DNDEBUG" -DCMAKE_CXX_FLAGS_DEBUG="-DNDEBUG"
+        -DCMAKE_INSTALL_PREFIX=check_install
+        -S ${{ github.workspace }}
+
+    - name: Build
+      run: |
+        cd ${{ steps.strings.outputs.build-output-dir }}
+        ninja
+        ninja install
+
+    - name: Unit tests
+      run: |
+        cd ${{ steps.strings.outputs.build-output-dir }}
+        ninja test
+
+    - name: Check binaries
+      run: |
+        cd ${{ github.workspace }}/check_install/bin
+        ./bnetserver --version
+        ./worldserver --version