From 2defd58899d929e30b1f6e967e719c2230aaf774 Mon Sep 17 00:00:00 2001
From: Mateusz Pusz <mateusz.pusz@gmail.com>
Date: Fri, 19 Mar 2021 09:58:01 +0100
Subject: [PATCH] ci: another effort to fix it

---
 .github/workflows/ci-test-package-cmake.yml | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/ci-test-package-cmake.yml b/.github/workflows/ci-test-package-cmake.yml
index fc26cdfc..03ffdb31 100644
--- a/.github/workflows/ci-test-package-cmake.yml
+++ b/.github/workflows/ci-test-package-cmake.yml
@@ -34,9 +34,6 @@ on:
     - 'example/**'
     - 'test/**'
 
-env:
-  CMAKE_GENERATOR: Ninja
-
 jobs:
   test_package:
     name: ${{ matrix.config.name }} ${{ matrix.build_type }}
@@ -48,7 +45,7 @@ jobs:
         - {
             name: "Windows MSVC 2019",
             os: windows-latest,
-            compiler: { type: VISUAL, version: 16, cc: "cl", cxx: "cl" }
+            compiler: { type: VISUAL, version: 16, cc: "", cxx: "" }
           }
         - {
             name: "Ubuntu GCC 10.1.0",
@@ -82,6 +79,12 @@ jobs:
         #     docker_image: conanio/gcc10
         #   }
         build_type: [ "Release", "Debug" ]
+
+    env:
+      CC: ${{ matrix.config.compiler.cc }}
+      CXX: ${{ matrix.config.compiler.cxx }}
+      CMAKE_GENERATOR: Ninja
+
     steps:
       - uses: actions/checkout@v2
       - name: Cache Conan data
@@ -131,10 +134,6 @@ jobs:
       - name: Configure Conan
         shell: bash
         run: |
-          if [[ "${{ matrix.config.compiler.type }}" == "GCC" || "${{ matrix.config.compiler.type }}" == "CLANG" ]]; then
-            export CC=${{ matrix.config.compiler.cc }}
-            export CXX=${{ matrix.config.compiler.cxx }}
-          fi
           conan config init
           conan remote add upload https://api.bintray.com/conan/mpusz/conan-mpusz
           conan profile update settings.build_type=${{ matrix.build_type }} default