CI: Normalize setting cmake variables and invoking cmake acoss all ci setups

3 files changed, 26 insertions, 10 deletions

diff --git a/.github/workflows/gcc-build.yml b/.github/workflows/gcc-build.yml
index 4f7b5818def..2d51498a0dd 100644
--- a/.github/workflows/gcc-build.yml
+++ b/.github/workflows/gcc-build.yml
@@ -8,17 +8,26 @@ jobs:
   build:
     runs-on: ubuntu-22.04
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
+    - name: Set reusable strings
+      id: strings
+      shell: bash
+      run: |
+        echo "build-output-dir=${{ github.workspace }}/bin" >> "$GITHUB_OUTPUT"
     - name: Dependencies
       run: |
         sudo apt-get update && sudo apt-get install -yq libboost-all-dev g++-11
         sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-11 100 --slave /usr/bin/g++ g++ /usr/bin/g++-11
     - name: Setup
-      run: |
-        mkdir bin
-        cd bin
-        cmake ../ -DWITH_WARNINGS=1 -DWITH_COREDEBUG=0 -DUSE_COREPCH=1 -DUSE_SCRIPTPCH=1 -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 -DBUILD_TESTING=1
-        cd ..
+      env:
+        CFLAGS: -Werror
+        CXXFLAGS: -Werror
+        CMAKE_BUILD_TYPE: Debug
+      run: >
+        cmake -S ${{ github.workspace }} -B ${{ steps.strings.outputs.build-output-dir }}
+        -DWITH_WARNINGS=1 -DWITH_COREDEBUG=0 -DUSE_COREPCH=1 -DUSE_SCRIPTPCH=1 -DTOOLS=1 -DSCRIPTS=dynamic -DSERVERS=1 -DNOJEM=0
+        -DCMAKE_C_FLAGS_DEBUG="-DNDEBUG" -DCMAKE_CXX_FLAGS_DEBUG="-DNDEBUG"
+        -DCMAKE_INSTALL_PREFIX=check_install -DBUILD_TESTING=1
     - name: Build
       run: |
         cd bin
@@ -29,6 +38,6 @@ jobs:
         make test
     - name: Check executables
       run: |
-        cd bin/check_install/bin
+        cd ${{ github.workspace }}/check_install/bin
         ./bnetserver --version
-        ./worldserver --version
\ No newline at end of file
+        ./worldserver --version
diff --git a/.github/workflows/macos-arm-build.yml b/.github/workflows/macos-arm-build.yml
index 3c890bd4dfb..fb353fd5ba3 100644
--- a/.github/workflows/macos-arm-build.yml
+++ b/.github/workflows/macos-arm-build.yml
@@ -36,9 +36,14 @@ jobs:
          echo "Cores: $(nproc), Arch: $(uname -p)"
         
     - name: Configure CMake
+      env:
+        CFLAGS: -Werror
+        CXXFLAGS: -Werror
+        CMAKE_BUILD_TYPE: Debug
       run: >
         cmake -GNinja -B ${{ steps.strings.outputs.build-output-dir }}
-        -DWITH_WARNINGS=1 -DWITH_COREDEBUG=0 -DUSE_COREPCH=1 -DUSE_SCRIPTPCH=1 -DTOOLS=1 -DSCRIPTS=static -DSERVERS=1 -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_FLAGS="-Werror" -DCMAKE_CXX_FLAGS="-Werror" -DCMAKE_C_FLAGS_DEBUG="-DNDEBUG" -DCMAKE_CXX_FLAGS_DEBUG="-DNDEBUG" -DBUILD_TESTING=1
+        -DWITH_WARNINGS=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 }}
 
diff --git a/.github/workflows/win-x64-build.yml b/.github/workflows/win-x64-build.yml
index 3c849e31f93..2a1f03c7c28 100644
--- a/.github/workflows/win-x64-build.yml
+++ b/.github/workflows/win-x64-build.yml
@@ -46,11 +46,13 @@ jobs:
 
     - name: Configure CMake
       env:
+        CFLAGS: /WX
         CXXFLAGS: /WX
         BOOST_ROOT: ${{ steps.install-boost.outputs.BOOST_ROOT }}
+        CMAKE_BUILD_TYPE: RelWithDebInfo
       run: >
         cmake -GNinja -S ${{ github.workspace }} -B ${{ steps.strings.outputs.build-output-dir }}
-        -DTOOLS=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo
+        -DTOOLS=ON
 
     - name: Build
       run: |