Merge 873d12a into b2f4252

Author: Meltie2013

.github/workflows/core_build.yml

@@ -7,6 +7,9 @@ on:
 
 jobs:
   build:
+    strategy:
+      fail-fast: false
+
     runs-on: ubuntu-latest
 
     steps:
@@ -20,11 +23,27 @@ jobs:
       - name: Install Required Packages
         run: sudo apt-get install -y git make cmake clang libssl-dev libbz2-dev build-essential default-libmysqlclient-dev libace-dev libreadline-dev
 
-      - name: Update Compilers
-        run: source ./apps/ci/ci-compiler-update.sh
+      - name: Install OpenSSL 3.5.1 Package Manually
+        run: |
+          wget https://www.openssl.org/source/openssl-3.5.1.tar.gz
+          tar -xvf openssl-3.5.1.tar.gz
+          cd openssl-3.5.1
+          ./config --prefix=/usr/local/openssl --openssldir=/usr/local/openssl
+          make -j$(nproc)
+          sudo make install
+
+      - name: Set OpenSSL 3.5.1 Environment Variables
+        run: |
+          echo "OPENSSL_ROOT_DIR=/usr/local/openssl" >> $GITHUB_ENV
+          echo "OPENSSL_INCLUDE_DIR=/usr/local/openssl/include" >> $GITHUB_ENV
+          echo "OPENSSL_LIBRARIES=/usr/local/openssl/lib" >> $GITHUB_ENV
+          echo "/usr/local/openssl/lib" | sudo tee /etc/ld.so.conf.d/openssl-3.5.conf
+          sudo ldconfig
 
       - name: Check for Submodule Updates
-        run: source ./apps/ci/ci-submodule-update.sh
+        run: |
+          git submodule init
+          git submodule update
 
       - name: Build Mangos Project
         run: source ./apps/ci/ci-compile.sh

.github/workflows/core_codestyle.yml

@@ -11,9 +11,19 @@ jobs:
       fail-fast: false
 
     runs-on: ubuntu-latest
+
     name: Check Codestyling
     steps:
       - uses: actions/checkout@v2
 
+      - name: Ensure grep supports -P
+        run: |
+          grep -P 'test' <<< 'test' || echo "::warning ::grep -P not supported"
+
+      - name: Install GNU grep (for full -P support)
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y grep
+
       - name: Check Codestyling
         run: source ./apps/ci/ci-codestyle.sh

apps/ci/ci-codestyle.sh

@@ -1,39 +1,62 @@
 #!/bin/bash
 
-set -e
-
+echo
+echo "Checking For MaNGOS Coding Standards:"
 echo "Starting Codestyling Script:"
 echo
 
 declare -A singleLineRegexChecks=(
     ["[[:blank:]]$"]="Remove whitespace at the end of the lines above"
     ["\t"]="Replace tabs with 4 spaces in the lines above"
+    ["^[[:blank:]]*(?:[a-zA-Z_][a-zA-Z_0-9]*[[:blank:]]+)*[a-zA-Z_][a-zA-Z_0-9]*[[:blank:]]*\([^)]*\)[[:blank:]]*\{[[:blank:]]*$"]="Move opening brace to a new line after function definition"
+    ["\{[[:blank:]]*\S"]="Opening brace must be on its own line (no code after '{')"
+    ["\S[[:blank:]]*\}"]="Closing brace must be on its own line (no code before '}')"
+    ["^[[:blank:]]*if\s*\(.*\)[[:blank:]]*(?!\{)"]="if statement must use braces"
+    ["^[[:blank:]]*else[[:blank:]]*(?!if|\{)"]="else statement must use braces"
+    ["\bif\("]="Missing space between 'if' and '('"
 )
 
-for check in ${!singleLineRegexChecks[@]}; do
-    echo "  Checking RegEx: '${check}'"
-    
-    if grep -P -r -I -n ${check} src; then
-        echo
-        echo "${singleLineRegexChecks[$check]}"
-        exit 1
-    fi
-done
+# Ignore directories
+grep_exclude_args=(
+    --exclude-dir="Eluna"
+    --exclude-dir="Extractor_Binaries"
+    --exclude-dir="MangosStrings_LanguageHGenerator"
+    --exclude-dir="restart-scripts"
+)
+
+# Accept multiple input paths
+input_paths=("$@")
+if [[ ${#input_paths[@]} -eq 0 ]]; then
+    input_paths=("src")  # fallback
+fi
 
-# declare -A multiLineRegexChecks=(
-#     ["\n\n\n"]="Multiple blank lines detected, keep only one. Check the files above"
-# )
+hadError=0
+declare -a triggeredDescriptions
 
-# for check in ${!multiLineRegexChecks[@]}; do
-#     echo "  Checking RegEx: '${check}'"
+for check in "${!singleLineRegexChecks[@]}"; do
+    ruleDesc="${singleLineRegexChecks[$check]}"
+    matches=$(grep -P -r -I -n "${grep_exclude_args[@]}" "${input_paths[@]}" -e "$check" 2>/dev/null)
 
-#     if grep -Pzo -r -I ${check} src; then
-#         echo
-#         echo
-#         echo "${multiLineRegexChecks[$check]}"
-#         exit 1
-#     fi
-# done
+    if [[ -n "$matches" ]]; then
+        echo
+        echo "== Rule triggered: $ruleDesc =="
+        echo "$matches"
+        triggeredDescriptions+=("$ruleDesc")
+        hadError=1
+    fi
+done
 
 echo
-echo "Awesome! No issues..."
+echo "------------------------------------------"
+echo "Summary of Triggered Rules:"
+echo "------------------------------------------"
+
+if [[ ${#triggeredDescriptions[@]} -eq 0 ]]; then
+    echo "No style violations found."
+else
+    for rule in "${triggeredDescriptions[@]}"; do
+        echo "$rule"
+    done
+fi
+
+exit $hadError

apps/ci/ci-compile.sh

@@ -3,14 +3,14 @@
 set -e
 
 # Check for & make directories
-time test -d _build || mkdir _build
-time test -d _install || mkdir _install
+test -d _build || mkdir _build
+test -d _install || mkdir _install
 
 # Move to build folder
-time cd _build
+cd _build
 
 # Run CMake Configurations
-time cmake .. -DCMAKE_INSTALL_PREFIX=../_install -DBUILD_TOOLS:BOOL=1 -DBUILD_MANGOSD:BOOL=1 -DBUILD_REALMD:BOOL=1 -DSOAP:BOOL=1 -DSCRIPT_LIB_ELUNA:BOOL=1 -DSCRIPT_LIB_SD3:BOOL=1 -DPLAYERBOTS:BOOL=1 -DUSE_STORMLIB:BOOL=1
+cmake .. -DCMAKE_INSTALL_PREFIX=../_install -DCMAKE_C_COMPILER=/usr/bin/clang -DCMAKE_CXX_COMPILER=/usr/bin/clang++ -DBUILD_TOOLS:BOOL=1 -DBUILD_MANGOSD:BOOL=1 -DBUILD_REALMD:BOOL=1 -DSOAP:BOOL=1 -DSCRIPT_LIB_ELUNA:BOOL=1 -DSCRIPT_LIB_SD3:BOOL=1 -DPLAYERBOTS:BOOL=1 -DUSE_STORMLIB:BOOL=1
 
 # Compile the Project
-time make -j 6
+make -j$(nproc)