Cleanup msvc CI

Signed-off-by: falkTX <falktx@falktx.com>

Author: falkTX

.github/workflows/cmake.yml

@@ -8,9 +8,6 @@ on:
     branches:
       - '*'
 
-env:
-  BUILD_TYPE: Release
-
 jobs:
   ubuntu-22-04:
     strategy:
@@ -87,78 +84,41 @@ jobs:
           suffix: _15
           target: ${{ matrix.target }}
 
-  cmake_win32:
+  msvc-win32:
     runs-on: windows-2022
     steps:
-    - name: Set environment
-      run: |
-        echo "release_arch=Win32" >> "${Env:GITHUB_ENV}"
-        echo "vcpkg_triplet=x86-windows-static" >> "${Env:GITHUB_ENV}"
-        echo "vcpkg_git_commit_id=a3db16a4475b963cacf0260068c497fb72c8f3c0" >> "${Env:GITHUB_ENV}"
-    - name: Restore from cache and install vcpkg
-      uses: lukka/run-vcpkg@v6
-      with:
-        setupOnly: true
-        vcpkgTriplet: ${{env.vcpkg_triplet}}
-        vcpkgGitCommitId: ${{env.vcpkg_git_commit_id}}
-    #- name: Install packages
-    #  run: |
-    #    & "${Env:VCPKG_ROOT}/vcpkg" install "cairo:${Env:vcpkg_triplet}"
     - uses: actions/checkout@v4
       with:
         submodules: recursive
-    - name: Create Build Environment
-      working-directory: ${{runner.workspace}}
-      run: cmake -E make_directory build
-    - name: Configure CMake
-      working-directory: ${{runner.workspace}}/build
+    - name: Configure
       run: |
-       cmake "${Env:GITHUB_WORKSPACE}" -G"Visual Studio 17 2022" -A"${Env:release_arch}" -DCMAKE_BUILD_TYPE="${Env:BUILD_TYPE}" -DVCPKG_TARGET_TRIPLET="${Env:vcpkg_triplet}" -DCMAKE_TOOLCHAIN_FILE="${Env:VCPKG_INSTALLATION_ROOT}/scripts/buildsystems/vcpkg.cmake"
-    - name: Build all
-      working-directory: ${{runner.workspace}}/build
-      run: cmake --build . --config "${Env:BUILD_TYPE}" -j 2
+       cmake -S . -B build -G"Visual Studio 17 2022" -A"Win32" -DCMAKE_BUILD_TYPE="Release"
+    - name: Build
+      run: cmake --build build --config "Release" -j 2
     - name: Show built files
-      working-directory: ${{runner.workspace}}/build/bin
+      working-directory: build/bin
       run: tree
     - uses: actions/upload-artifact@v4
       with:
-        name: Win32 artifacts
-        path: ${{runner.workspace}}/build/bin/
+        name: msvc-win32
+        path: build/bin/
 
-  cmake_win64:
+  msvc-win64:
     runs-on: windows-2022
     steps:
-    - name: Set environment
-      run: |
-        echo "release_arch=x64" >> "${Env:GITHUB_ENV}"
-        echo "vcpkg_triplet=x64-windows-static" >> "${Env:GITHUB_ENV}"
-        echo "vcpkg_git_commit_id=a3db16a4475b963cacf0260068c497fb72c8f3c0" >> "${Env:GITHUB_ENV}"
-    - name: Restore from cache and install vcpkg
-      uses: lukka/run-vcpkg@v6
-      with:
-        setupOnly: true
-        vcpkgTriplet: ${{env.vcpkg_triplet}}
-        vcpkgGitCommitId: ${{env.vcpkg_git_commit_id}}
-    #- name: Install packages
-    #  run: |
-    #    & "${Env:VCPKG_ROOT}/vcpkg" install "cairo:${Env:vcpkg_triplet}"
     - uses: actions/checkout@v4
       with:
         submodules: recursive
-    - name: Create Build Environment
-      working-directory: ${{runner.workspace}}
-      run: cmake -E make_directory build
     - name: Configure CMake
-      working-directory: ${{runner.workspace}}/build
       run: |
-       cmake "${Env:GITHUB_WORKSPACE}" -G"Visual Studio 17 2022" -A"${Env:release_arch}" -DCMAKE_BUILD_TYPE="${Env:BUILD_TYPE}" -DVCPKG_TARGET_TRIPLET="${Env:vcpkg_triplet}" -DCMAKE_TOOLCHAIN_FILE="${Env:VCPKG_INSTALLATION_ROOT}/scripts/buildsystems/vcpkg.cmake"
+       cmake -S . -B build -G"Visual Studio 17 2022" -A"x64" -DCMAKE_BUILD_TYPE="Release"
     - name: Build all
-      working-directory: ${{runner.workspace}}/build
-      run: cmake --build . --config "${Env:BUILD_TYPE}" -j 2
+      working-directory: build
+      run: cmake --build . --config "Release" -j 2
     - name: Show built files
-      working-directory: ${{runner.workspace}}/build/bin
+      working-directory: build/bin
       run: tree
     - uses: actions/upload-artifact@v4
       with:
-        name: Win64 artifacts
-        path: ${{runner.workspace}}/build/bin/
+        name: msvc-win64
+        path: build/bin/