Merge remote-tracking branch 'upstream/master' into feature/organize-…

…workflow
mangoszero · Oct 1, 2024 · a239418 · a239418
2 parents 1b5888e + c10270f
commit a239418
Show file tree

Hide file tree

Showing 95 changed files with 4,637 additions and 3,210 deletions.
diff --git a/.github/workflows/core_windows_build.yml b/.github/workflows/core_windows_build.yml
@@ -22,7 +22,7 @@ jobs:
           sdk-version: 22621
 
       - name: Install OpenSSL
-        run: choco install --no-progress openssl --version=3.3.1
+        run: choco install --no-progress openssl
 
       - name: Checkout Submodules
         shell: bash

diff --git a/.gitignore b/.gitignore
@@ -64,6 +64,8 @@ Thumbs.db
 _build
 build
 /dep/libmpq/autom4te.cache/
+/ACE_wrappers/*
+/ACE*.tar.bz2
 
 # Generated files
 *.ncb

diff --git a/cmake/FindMySQL.cmake b/cmake/FindMySQL.cmake
@@ -52,7 +52,7 @@ if (_MYSQL_USE_PKGCONFIG)
 endif ()
 
 if(NOT MySQL_FOUND)
-  set(_MySQL_mariadb_versions 10.1 10.2 10.3 10.4 10.5 10.6 10.7 10.8 10.9 10.10 10.11 10.12 10.13 10.14 10.15)
+  set(_MySQL_mariadb_versions 10.1 10.2 10.3 10.4 10.5 10.6 10.7 10.8 10.9 10.10 10.11 10.12 10.13 10.14 10.15 11.5 11.6 11.7)
   set(_MySQL_versions 5.4 5.5 5.6 5.7 8.0)
   set(_MySQL_paths)
   foreach (_MySQL_version IN LISTS _MySQL_mariadb_versions)

diff --git a/cmake/MangosParams.cmake b/cmake/MangosParams.cmake
@@ -1,5 +1,5 @@
 set(MANGOS_EXP "CLASSIC")
 set(MANGOS_PKG "Mangos Zero")
-set(MANGOS_WORLD_VER 2023031100)
+set(MANGOS_WORLD_VER 2024061600)
 set(MANGOS_REALM_VER 2021010100)
 set(MANGOS_AHBOT_VER 2021010100)
diff --git a/cmake/StatusInfo.cmake b/cmake/StatusInfo.cmake
@@ -6,7 +6,7 @@ message("Install configs to    : ${CONF_INSTALL_DIR}")
 
 message("")
 message("Detailed Information")
-message("+-- opeating system   : ${CMAKE_HOST_SYSTEM}")
+message("+-- operating system   : ${CMAKE_HOST_SYSTEM}")
 message("+-- cmake version     : ${CMAKE_VERSION}")
 message("")
 

diff --git a/dockercontainer/DockerFile-mangosd b/dockercontainer/DockerFile-mangosd
@@ -2,7 +2,7 @@
 FROM ubuntu:18.04 as build-step
 
 RUN apt-get -y update
-RUN apt-get -y install curl autoconf automake libbz2-dev libace-dev libssl-dev libmysqlclient-dev libtool build-essential gpg wget
+RUN apt-get -y install curl autoconf automake libbz2-dev libace-dev libssl-dev libmysqlclient-dev libtool build-essential gpg wget lsb-release software-properties-common
 
 RUN wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | gpg --dearmor - | tee /usr/share/keyrings/kitware-archive-keyring.gpg >/dev/null && \
     echo 'deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ bionic main' | tee /etc/apt/sources.list.d/kitware.list >/dev/null && \