Final CI touchups

Author: zach2good

.clang-format

@@ -1,11 +1,25 @@
 ---
-BasedOnStyle: WebKit
+# https://clang.llvm.org/docs/ClangFormatStyleOptions.html
+# We base things of WebKit + Allman braces
+# BasedOnStyle: WebKit
+AccessModifierOffset: -4
+AllowShortFunctionsOnASingleLine: None
 BreakBeforeBraces: Allman
-Cpp11BracedListStyle: 'true'
+BreakConstructorInitializers: BeforeComma
+# This is not the ACTUAL column limit, this is just to make
+# clang-format chill out! Use your best judgement!
+ColumnLimit: 160
+CompactNamespaces: 'false'
+ConstructorInitializerIndentWidth: 0
+Cpp11BracedListStyle: 'false'
+IndentCaseLabels: 'true'
+IndentWidth: 4
+KeepEmptyLinesAtTheStartOfBlocks: 'false'
 Language: Cpp
 PointerAlignment: Left
 SortIncludes: 'true'
 SortUsingDeclarations: 'true'
+SpaceBeforeParens: ControlStatements
 Standard: Cpp11
 UseTab: Never
 

.clang-tidy

@@ -0,0 +1,25 @@
+---
+# https://clang.llvm.org/extra/clang-tidy/checks/list.html
+Checks: >
+  -*,
+  bugprone-*,
+  -bugprone-reserved-identifier,
+  cert-flp30-c,
+  cert-mem57-cpp,
+  cert-oop57-cpp,
+  cert-oop58-cpp,
+  clang-analyzer-*,
+  readability-*,
+  readability-braces-around-statements,
+  -readability-magic-numbers,
+  -readability-convert-member-functions-to-static,
+  -readability-implicit-bool-conversion,
+  modernize-*,
+  -modernize-use-trailing-return-type,
+  performance-*,
+  cppcoreguidelines-pro-type-cstyle-cast,
+  cppcoreguidelines-pro-type-static-cast-downcast,
+WarningsAsErrors: ''
+HeaderFilterRegex: '/src/*'
+AnalyzeTemporaryDtors: false
+...

.github/workflows/build.yml

@@ -13,7 +13,7 @@ on:
       - 'feature/**'
 
 jobs:
-  Linux_Build_32bit:
+  Linux_Build_Clang_32bit:
     runs-on: ubuntu-18.04
     steps:
     - uses: actions/checkout@v1
@@ -22,15 +22,19 @@ jobs:
     - name: Install Dependencies
       run: |
         sudo apt-get update
-        sudo apt-get install -y software-properties-common g++-8 luajit-5.1-dev libzmq3-dev luarocks python3.7
-    - name: Build C++
+        sudo apt-get install -y software-properties-common cmake libmariadb-dev-compat libluajit-5.1-dev libzmq3-dev zlib1g-dev libssl-dev
+    - name: Configure CMake
+      run: |
+        export CC=/usr/bin/clang
+        export CXX=/usr/bin/clang++
+        export CFLAGS=-m32
+        export CXXFLAGS=-m32
+        cmake .
+    - name: Build
       run: |
-        g++ --version
-        sh autogen.sh  "CFLAGS=-m32" "CXXFLAGS=-m32" "LDFLAGS=-m32"
-        ./configure
         make -j $(nproc)
 
-  Linux_Build_32bit_CMake:
+  Linux_Build_GCC_32bit:
     runs-on: ubuntu-18.04
     steps:
     - uses: actions/checkout@v1
@@ -39,14 +43,19 @@ jobs:
     - name: Install Dependencies
       run: |
         sudo apt-get update
-        sudo apt-get install -y software-properties-common g++-8 luajit-5.1-dev libzmq3-dev luarocks python3.7 cmake
-    - name: Build C++
+        sudo apt-get install -y software-properties-common cmake libmariadb-dev-compat libluajit-5.1-dev libzmq3-dev zlib1g-dev libssl-dev
+    - name: Configure CMake
       run: |
-        g++ --version
+        export CC=/usr/bin/gcc
+        export CXX=/usr/bin/g++
+        export CFLAGS=-m32
+        export CXXFLAGS=-m32
         cmake .
+    - name: Build
+      run: |
         make -j $(nproc)
 
-  Linux_Build_64bit:
+  Linux_Build_GCC_64bit:
     runs-on: ubuntu-18.04
     steps:
     - uses: actions/checkout@v1
@@ -55,53 +64,51 @@ jobs:
     - name: Install Dependencies
       run: |
         sudo apt-get update
-        sudo apt-get install -y software-properties-common g++-8 luajit-5.1-dev libzmq3-dev luarocks python3.7
-    - name: Build C++
+        sudo apt-get install -y software-properties-common cmake libmariadb-dev-compat libluajit-5.1-dev libzmq3-dev zlib1g-dev libssl-dev
+    - name: Configure CMake
+      run: |
+        export CC=/usr/bin/gcc
+        export CXX=/usr/bin/g++
+        CFLAGS=-m64 CXXFLAGS=-m64 LDFLAGS=-m64 cmake .
+    - name: Build
       run: |
-        g++ --version
-        sh autogen.sh
-        ./configure "CFLAGS=-m64" "CXXFLAGS=-m64" "LDFLAGS=-m64"
         make -j $(nproc)
 
-  Windows_Build_32bit:
+  Windows_Build_2019_32bit:
     runs-on: windows-2019
     env:
       MSBUILD_PATH: C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\MSBuild\Current\Bin\
     steps:
       - uses: actions/checkout@v1
         with:
           fetch-depth: 0
-      - name: Build Solution
+      - name: Configure CMake
         shell: cmd
+        # windows-2019 CI machine has MySQL installed, need to specific our location by hand
         run: |
-          "%MSBUILD_PATH%\MSBuild.exe" win32/topaz.sln /property:Platform=Win32
-
-  Windows_Build_32bit_CMake:
-    runs-on: windows-2019
-    env:
-      MSBUILD_PATH: C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\MSBuild\Current\Bin\
-    steps:
-      - uses: actions/checkout@v1
-        with:
-          fetch-depth: 0
-      - name: Build Solution
+          cmake -A Win32 . -DMYSQL_INCLUDE_DIR='%CD%/ext/include/mysql' -DMYSQL_LIBRARY='%CD%/ext/lib/libmariadb.lib'
+      - name: Build
         shell: cmd
         run: |
-          cmake . -G "Visual Studio 16 2019"
-          "%MSBUILD_PATH%\MSBuild.exe" topaz.sln
+          cmake --build .
 
-  Windows_Build_64bit:
+  Windows_Build_2019_64bit:
     runs-on: windows-2019
     env:
       MSBUILD_PATH: C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\MSBuild\Current\Bin\
     steps:
       - uses: actions/checkout@v1
         with:
           fetch-depth: 0
-      - name: Build Solution
+      - name: Configure CMake
         shell: cmd
+        # windows-2019 CI machine has MySQL installed, need to specific our location by hand
         run: |
-          "%MSBUILD_PATH%\MSBuild.exe" win32/topaz.sln /property:Platform=x64
+          cmake -A x64 . -DMYSQL_INCLUDE_DIR='%CD%/ext/include/mysql' -DMYSQL_LIBRARY='%CD%/ext/lib64/libmariadb64.lib'
+      - name: Build
+        shell: cmd
+        run: |
+          cmake --build .
 
   Style_Checks:
     runs-on: ubuntu-20.04
@@ -159,12 +166,12 @@ jobs:
     - name: Install Dependencies
       run: |
         sudo apt-get update
-        sudo apt-get install -y software-properties-common mariadb-server-10.1 libmariadb-dev-compat libluajit-5.1-dev libzmq3-dev autoconf pkg-config zlib1g-dev libssl-dev
+        sudo apt-get install -y software-properties-common cmake mariadb-server-10.1 libmariadb-dev-compat libluajit-5.1-dev libzmq3-dev zlib1g-dev libssl-dev luarocks python3.7
+    - name: Configure CMake
+      run: |
+        cmake .
     - name: Build Binaies
       run: |
-        g++ --version
-        sh autogen.sh
-        ./configure "CFLAGS=-m64" "CXXFLAGS=-m64" "LDFLAGS=-m64"
         make -j $(nproc)
     - name: Verify MySQL connection from container
       run: |
@@ -181,8 +188,9 @@ jobs:
         cp conf/default/* conf/
     - name: Run services (2 mins)
       env:
-        MYSQL_HOST: mydb
+        MYSQL_HOST: mysql
       run: |
+        ls -l
         screen -d -m -S topaz_connect ./topaz_connect --log login-server.log
         screen -d -m -S topaz_game ./topaz_game --log map-server.log
         screen -d -m -S topaz_search ./topaz_search --log search-server.log
@@ -194,14 +202,14 @@ jobs:
         cat map-server.log
         cat search-server.log
 
-        if grep -q error login-server.log; then
+        if grep -qi "Error" login-server.log; then
             exit -1
         fi
 
-        if grep -q error map-server.log; then
+        if grep -qi "Error" map-server.log; then
             exit -1
         fi
 
-        if grep -q error search-server.log; then
+        if grep -qi "Error" search-server.log; then
             exit -1
         fi

.gitignore

@@ -63,6 +63,10 @@ ipch/
 # ReSharper is a .NET coding add-in
 _ReSharper*
 
+# Jetbrains directories
+.idea
+cmake-*
+
 # NCrunch
 *.ncrunch*
 .*crunch*.local.xml
@@ -129,6 +133,9 @@ UpgradeLog*.XML
 /topaz_connect
 /topaz_game
 /topaz_search
+/topaz_connect_64
+/topaz_game_64
+/topaz_search_64
 
 # Generated files, mostly autotools-related
 .deps
@@ -190,6 +197,3 @@ cmake_install.cmake
 /conf/search_server.conf
 /conf/server_message.conf
 /conf/server_message_fr.conf
-
-# Jetbrains files
-.idea/

CMakeLists.txt

@@ -5,23 +5,31 @@ set_property(GLOBAL PROPERTY CXX_STANDARD 17)
 set_property(GLOBAL PROPERTY CXX_STANDARD_REQUIRED ON)
 set_property(GLOBAL PROPERTY CXX_EXTENSIONS ON)
 set_property(GLOBAL PROPERTY LINKER_LANGUAGE CXX)
+set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 
 set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
 include(Platform)
 include(StandardProjectSettings)
 include(CompilerWarnings)
 include(Sanitizers)
+include(ClangTidy)
 
 message(STATUS "CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
 message(STATUS "CMAKE_C_COMPILER: ${CMAKE_C_COMPILER}")
 message(STATUS "CMAKE_CXX_COMPILER: ${CMAKE_CXX_COMPILER}")
 message(STATUS "CMAKE_CXX_COMPILER_ID: ${CMAKE_CXX_COMPILER_ID}")
 message(STATUS "CMAKE_CXX_COMPILER_VERSION: ${CMAKE_CXX_COMPILER_VERSION}")
+message(STATUS "CMAKE_CXX_FLAGS: ${CMAKE_CXX_FLAGS}")
 message(STATUS "CMAKE_GENERATOR_PLATFORM: ${CMAKE_GENERATOR_PLATFORM}")
 
 # set(CMAKE_VERBOSE_MAKEFILE ON)
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
+set(LOCAL_INCLUDE_PATH ${PROJECT_SOURCE_DIR}/ext/include)
+set(LOCAL_LIB_PATH ${PROJECT_SOURCE_DIR}/ext/${libpath})
+message(STATUS "LOCAL_INCLUDE_PATH: ${LOCAL_INCLUDE_PATH}")
+message(STATUS "LOCAL_LIB_PATH: ${LOCAL_LIB_PATH}")
+
 # Find Threads (pthread)
 set(THREADS_PREFER_PTHREAD_FLAG ON)
 find_package(Threads REQUIRED)

CMakeSettings.json

@@ -1,54 +1,52 @@
-{
-  "environments": [
-    {
-      "BuildDir": "${workspaceRoot}\\build\\${name}",
-      "InstallDir": "${workspaceRoot}\\build\\${name}\\bin"
-    }
-  ],
+{
   "configurations": [
     {
       "name": "x86-Debug",
-      "generator": "Visual Studio 16 2019",
+      "generator": "Ninja",
       "configurationType": "Debug",
-      "inheritEnvironments": [ "msvc_x86" ],
-      "buildRoot": "${env.BuildDir}",
-      "installRoot": "${env.InstallDir}",
+      "buildRoot": "${projectDir}\\out\\build\\${name}",
+      "installRoot": "${projectDir}\\out\\install\\${name}",
       "cmakeCommandArgs": "",
-      "buildCommandArgs": "-v:detailed",
-      "ctestCommandArgs": ""
+      "buildCommandArgs": "",
+      "ctestCommandArgs": "",
+      "inheritEnvironments": [ "msvc_x86" ],
+      "variables": []
     },
     {
       "name": "x86-Release",
-      "generator": "Visual Studio 16 2019",
-      "configurationType": "Release",
-      "inheritEnvironments": [ "msvc_x86" ],
-      "buildRoot": "${env.BuildDir}",
-      "installRoot": "${env.InstallDir}",
+      "generator": "Ninja",
+      "configurationType": "RelWithDebInfo",
+      "buildRoot": "${projectDir}\\out\\build\\${name}",
+      "installRoot": "${projectDir}\\out\\install\\${name}",
       "cmakeCommandArgs": "",
-      "buildCommandArgs": "-v:detailed",
-      "ctestCommandArgs": ""
+      "buildCommandArgs": "",
+      "ctestCommandArgs": "",
+      "inheritEnvironments": [ "msvc_x86" ],
+      "variables": []
     },
     {
       "name": "x64-Debug",
-      "generator": "Visual Studio 16 2019 Win64",
+      "generator": "Ninja",
       "configurationType": "Debug",
-      "inheritEnvironments": [ "msvc_x64" ],
-      "buildRoot": "${env.BuildDir}",
-      "installRoot": "${env.InstallDir}",
+      "buildRoot": "${projectDir}\\out\\build\\${name}",
+      "installRoot": "${projectDir}\\out\\install\\${name}",
       "cmakeCommandArgs": "",
-      "buildCommandArgs": "-v:detailed",
-      "ctestCommandArgs": ""
+      "buildCommandArgs": "",
+      "ctestCommandArgs": "",
+      "inheritEnvironments": [ "msvc_x64_x64" ],
+      "variables": []
     },
     {
       "name": "x64-Release",
-      "generator": "Visual Studio 16 2019 Win64",
-      "configurationType": "Release",
-      "inheritEnvironments": [ "msvc_x64" ],
-      "buildRoot": "${env.BuildDir}",
-      "installRoot": "${env.InstallDir}",
+      "generator": "Ninja",
+      "configurationType": "RelWithDebInfo",
+      "buildRoot": "${projectDir}\\out\\build\\${name}",
+      "installRoot": "${projectDir}\\out\\install\\${name}",
       "cmakeCommandArgs": "",
-      "buildCommandArgs": "-v:detailed",
-      "ctestCommandArgs": ""
+      "buildCommandArgs": "",
+      "ctestCommandArgs": "",
+      "inheritEnvironments": [ "msvc_x64_x64" ],
+      "variables": []
     }
   ]
-}
+}