Update build.yml

NickvisionApps · Dec 1, 2023 · e024cd6 · e024cd6
1 parent bda0f26
commit e024cd6
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -22,15 +22,13 @@ jobs:
           artifact: "Linux-x64.zip"
           conan-profile: conanprofile-linux.txt
           conan-file: conanfile-linux.txt
-          conan-release: /Release
           env:
             CC: gcc
             CXX: g++
         - os: windows-latest
           artifact: "Windows-x64.zip"
           conan-profile: conanprofile-windows.txt
           conan-file: conanfile-windows.txt
-          conan-release: ""
       fail-fast: false
     steps:
       - name: "Checkout"  
@@ -41,11 +39,18 @@ jobs:
         uses: turtlebrowser/get-conan@main
       - name: "Install Conan"
         run: conan install ${{matrix.config.conan-file}} --profile:host=${{matrix.config.conan-profile}} --profile:build=${{matrix.config.conan-profile}} -s compiler.cppstd=20 --build=missing
-      - name: "CMake Build"
+      - name: "CMake Build (Linux)"
+	      if: matrix.config.os == ubuntu-latest
         working-directory: ${{github.workspace}}/build
         run: |
-          cmake .. -DCMAKE_TOOLCHAIN_FILE="${{github.workspace}}/build${{matrix.config.conan-release}}/generators/conan_toolchain.cmake" -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
+          cmake .. -DCMAKE_TOOLCHAIN_FILE="${{github.workspace}}/build/Release/generators/conan_toolchain.cmake" -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
           cmake --build .
+      - name: "CMake Build (Windows)"
+	      if: matrix.config.os == windows-latest
+        working-directory: ${{github.workspace}}/build
+        run: |
+          cmake .. -G "Visual Studio 17 2022" -DCMAKE_TOOLCHAIN_FILE="${{github.workspace}}/build/generators/conan_toolchain.cmake"
+          cmake --build . --config ${{env.BUILD_TYPE}}
       - name: "CMake Install"
         working-directory: ${{github.workspace}}/build
         run: cmake --install . --prefix "${{github.workspace}}/install"