fix(ci): 32-bit env with ninja

also, shame on you, github dev, for starting a random
merge conflict for completely no reason

Author: Xenapte

.github/workflows/client.yml

@@ -62,6 +62,8 @@ jobs:
 
       # Setup MSVC command prompt environment vars
       - uses: ilammy/msvc-dev-cmd@v1
+        with:
+          arch: win32
 
       - name: Restore artifacts, setup vcpkg
         uses: lukka/run-vcpkg@v11
@@ -78,7 +80,7 @@ jobs:
       - name: Configure CMake
         run: |
           echo "`nfile(WRITE ${{github.workspace}}/version.txt `${BMMO_VER})" | Out-File CMakeLists.txt -Encoding "UTF8" -Append
-          cmake -G Ninja -B ${{github.workspace}}/build -S ${{github.workspace}} -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_TOOLCHAIN_FILE="${{env.VCPKG_ROOT}}/scripts/buildsystems/vcpkg.cmake" -DVCPKG_MANIFEST_MODE=ON -DVCPKG_MANIFEST_DIR="${{github.workspace}}" -DVCPKG_TARGET_TRIPLET=x86-windows -DVIRTOOLS_SDK_FETCH_FROM_GIT=ON -DBUILD_SERVER=OFF -DBUILD_CLIENT=ON -A Win32
+          cmake -G Ninja -B ${{github.workspace}}/build -S ${{github.workspace}} -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_TOOLCHAIN_FILE="${{env.VCPKG_ROOT}}/scripts/buildsystems/vcpkg.cmake" -DVCPKG_MANIFEST_MODE=ON -DVCPKG_MANIFEST_DIR="${{github.workspace}}" -DVCPKG_TARGET_TRIPLET=x86-windows -DVIRTOOLS_SDK_FETCH_FROM_GIT=ON -DBUILD_SERVER=OFF -DBUILD_CLIENT=ON
           echo "BMMO_VER=$(cat ${{github.workspace}}/version.txt)" >> $env:GITHUB_ENV
           echo "SHA_SHORT=$(git rev-parse --short ${{github.sha}})" >> $env:GITHUB_ENV
 

.github/workflows/server.yml

@@ -37,15 +37,9 @@ jobs:
       # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
       # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
       run: |
-<<<<<<< HEAD
         echo -e "\nfile(WRITE ${{github.workspace}}/version.txt \${BMMO_VER})" >> CMakeLists.txt
-        cmake -B ${{github.workspace}}/build -S ${{github.workspace}} -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DBUILD_SERVER=ON -DBUILD_CLIENT=OFF -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_SERVER_APPIMAGE=ON
-        echo "BMMO_VER=$(cat ${{github.workspace}}/version.txt)" >> "$GITHUB_ENV"
-=======
-        echo -e "\nfile(WRITE version.txt \${BMMO_VER})" >> CMakeLists.txt
         cmake -G Ninja -B ${{github.workspace}}/build -S ${{github.workspace}} -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DBUILD_SERVER=ON -DBUILD_CLIENT=OFF -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_SERVER_APPIMAGE=ON
-        echo "BMMO_VER=$(cat version.txt)" >> "$GITHUB_ENV"
->>>>>>> 311621b404d4d6fb65fc24526ba0c15a229d0d6e
+        echo "BMMO_VER=$(cat ${{github.workspace}}/version.txt)" >> "$GITHUB_ENV"
         echo "SHA_SHORT=$(git rev-parse --short ${{github.sha}})" >> "$GITHUB_ENV"
 
     - name: Build and install