From 43fc0a2a63c4b03c91905e5ae9277a8e17ec50ab Mon Sep 17 00:00:00 2001
From: McMassiveNZ <12842622+McMassiveNZ@users.noreply.github.com>
Date: Sun, 29 Jan 2023 21:13:02 +0100
Subject: [PATCH] More windows compilers

---
 .github/workflows/ci.yml | 32 ++++++--------------------------
 1 file changed, 6 insertions(+), 26 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 398860d..ddee028 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -7,43 +7,29 @@ on:
     branches: [ "main" ]
 
 env:
-  # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
-  BUILD_TYPE: Release
+  CLANG_TIDY_VERSION: "13.0.0"
 
 jobs:
   build:
-    # The CMake configure and build commands are platform agnostic and should work equally well on Windows or Mac.
-    # You can convert this to a matrix build if you need cross-platform coverage.
-    # See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
     runs-on: ${{matrix.os}}
     strategy: 
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
+        os: [windows-latest, ubuntu-latest, macos-latest]
         build_configuration: [Debug, Release]
         compiler: [llvm, gcc]
         vcpkg_bootstrap: [bootstrap-vcpkg.sh]
-        
+
         exclude:
           - os: windows-latest
             vcpkg_bootstrap: bootstrap-vcpkg.sh
-        
+
         include:
           - os: 'windows-latest'
             triplet: x64-windows
             vcpkg_bootstrap: bootstrap-vcpkg.bat
-            compiler: "msvc"
-            build_configuration: Debug
-            
-          - os: 'windows-latest'
-            triplet: x64-windows
-            vcpkg_bootstrap: bootstrap-vcpkg.bat
-            compiler: "msvc"
-            build_configuration: Release
-            
           - os: 'ubuntu-latest'
             triplet: x64-linux
-            
           - os: 'macos-latest'
             triplet: x64-osx
 
@@ -65,14 +51,13 @@ jobs:
           ${{ env.APPDATA }}\vcpkg\archives
         key: ${{ runner.os }}-${{ matrix.compiler }}-${{ matrix.build_configuration }}-${{ hashFiles('**/CMakeLists.txt') }}-${{ hashFiles('./vcpkg.json')}}
         restore-keys: |
-          ${{ runner.os }}-${{ env.BUILD_TYPE }}-
+          ${{ runner.os }}-${{ matrix.build_configuration }}-
 
     - name: setup dependencies
       uses: aminya/setup-cpp@v1
       with:
         compiler: ${{ matrix.compiler }}
-        vcvarsall: ${{ contains(matrix.os, 'windows' )}}
-
+        vcvarsall: ${{ contains(matrix.os, 'windows')}}
         cmake: true
         ninja: true
         vcpkg: true
@@ -87,18 +72,13 @@ jobs:
       run: ${{github.workspace}}/external/vcpkg/vcpkg install spdlog --triplet ${{matrix.triplet}}
 
     - name: Configure CMake
-      # 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: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{matrix.build_configuration}} 
         -DCMAKE_TOOLCHAIN_FILE=${{github.workspace}}/external/vcpkg/scripts/buildsystems/vcpkg.cmake
 
     - name: Build
-      # Build your program with the given configuration
       run: cmake --build ${{github.workspace}}/build --config ${{matrix.build_configuration}}
 
     - name: Test
       working-directory: ${{github.workspace}}/build
-      # Execute tests defined by the CMake configuration.
-      # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
       run: ctest -C ${{matrix.build_configuration}}