From 1b90036cf2f66f34adb1d25fd7ee61a27e4a4bea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luis=20D=C3=ADaz=20M=C3=A1s?= <piponazo@gmail.com>
Date: Wed, 9 Feb 2022 19:30:34 +0100
Subject: [PATCH] ci-conan: be more explicit about desired compiler in conan
 profile (#2085)

* ci-conan: be more explicit about desired compiler in conan profile

* conan: upgrade to latest version
---
 .github/workflows/on_PR_linux_matrix.yml         |  2 +-
 .github/workflows/on_PR_linux_special_builds.yml | 10 +++++-----
 .github/workflows/on_PR_windows_matrix.yml       |  6 ++++--
 .github/workflows/on_push_BasicWinLinMac.yml     |  8 +++++---
 .github/workflows/on_push_ExtraJobsForMain.yml   |  2 +-
 5 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/on_PR_linux_matrix.yml b/.github/workflows/on_PR_linux_matrix.yml
index d47eb538..ce18a326 100644
--- a/.github/workflows/on_PR_linux_matrix.yml
+++ b/.github/workflows/on_PR_linux_matrix.yml
@@ -19,7 +19,7 @@ jobs:
       - name: install dependencies
         run: |
           sudo apt-get install ninja-build
-          pip3 install conan==1.43.0
+          pip3 install conan==1.45.0
 
       - name: Conan common config
         run: |
diff --git a/.github/workflows/on_PR_linux_special_builds.yml b/.github/workflows/on_PR_linux_special_builds.yml
index 975c319a..f9a66f0d 100644
--- a/.github/workflows/on_PR_linux_special_builds.yml
+++ b/.github/workflows/on_PR_linux_special_builds.yml
@@ -18,7 +18,7 @@ jobs:
       - name: install dependencies
         run: |
           sudo apt-get install ninja-build
-          pip3 install conan==1.43.0
+          pip3 install conan==1.45.0
           pip3 install gcovr
 
       - name: Conan common config
@@ -77,7 +77,7 @@ jobs:
         run: |
           sudo apt-get update
           sudo apt-get install valgrind ninja-build
-          pip3 install conan==1.43.0
+          pip3 install conan==1.45.0
 
       - name: Conan common config
         run: |
@@ -113,7 +113,7 @@ jobs:
       - name: install dependencies
         run: |
           sudo apt-get install ninja-build
-          pip3 install conan==1.43.0
+          pip3 install conan==1.45.0
 
       - name: Conan common config
         run: |
@@ -162,7 +162,7 @@ jobs:
         run: |
           sudo apt-get update
           sudo apt-get install valgrind doxygen graphviz gettext
-          pip3 install conan==1.43.0
+          pip3 install conan==1.45.0
 
       - name: Conan common config
         run: |
@@ -211,7 +211,7 @@ jobs:
 
       - name: install dependencies
         run: |
-          pip3 install conan==1.43.0
+          pip3 install conan==1.45.0
           sudo add-apt-repository ppa:ubuntu-lxc/daily -y
           wget -q -O - https://files.pvs-studio.com/etc/pubkey.txt |sudo apt-key add -
           sudo wget -O /etc/apt/sources.list.d/viva64.list https://files.pvs-studio.com/etc/viva64.list
diff --git a/.github/workflows/on_PR_windows_matrix.yml b/.github/workflows/on_PR_windows_matrix.yml
index 9e8cf6bf..eb2e58b3 100644
--- a/.github/workflows/on_PR_windows_matrix.yml
+++ b/.github/workflows/on_PR_windows_matrix.yml
@@ -11,7 +11,7 @@ on:
 jobs:
   windows:
     name: 'Win10 Arch: ${{matrix.platform}} BuildType:${{matrix.build_type}} - SHARED:${{matrix.shared_libraries}}'
-    runs-on: windows-latest
+    runs-on: windows-2022
 
     strategy:
       fail-fast: false
@@ -46,10 +46,12 @@ jobs:
 
       - name: Install Conan & Common config
         run: |
-          pip.exe install "conan==1.43.0"
+          pip.exe install "conan==1.45.0"
           conan config install https://github.com/conan-io/conanclientcert.git
           conan profile new --detect default
           conan profile update settings.build_type=${{matrix.build_type}} default
+          conan profile update settings.compiler="Visual Studio" default
+          conan profile update settings.compiler.version=17 default
           conan config set storage.path=$Env:GITHUB_WORKSPACE/conanCache
           conan config get storage.path
           tree /f ./conanCache
diff --git a/.github/workflows/on_push_BasicWinLinMac.yml b/.github/workflows/on_push_BasicWinLinMac.yml
index 83c9ff65..fe13b4dd 100644
--- a/.github/workflows/on_push_BasicWinLinMac.yml
+++ b/.github/workflows/on_push_BasicWinLinMac.yml
@@ -9,7 +9,7 @@ name: On PUSH - Basic CI for main platforms
 jobs:
   windows:
     name: 'Win10 Arch:x64 BuildType:Release - SHARED'
-    runs-on: windows-latest
+    runs-on: windows-2022
 
     steps:
       - uses: actions/checkout@v2
@@ -31,9 +31,11 @@ jobs:
 
       - name: Install Conan & Common config
         run: |
-          pip.exe install "conan==1.43.0"
+          pip.exe install "conan==1.45.0"
           conan profile new --detect default
           conan profile show default
+          conan profile update settings.compiler="Visual Studio" default
+          conan profile update settings.compiler.version=17 default
 
       - name: Run Conan
         run: |
@@ -75,7 +77,7 @@ jobs:
       - name: install dependencies
         run: |
           sudo apt-get install ninja-build
-          pip3 install conan==1.43.0
+          pip3 install conan==1.45.0
 
       - name: Conan
         run: |
diff --git a/.github/workflows/on_push_ExtraJobsForMain.yml b/.github/workflows/on_push_ExtraJobsForMain.yml
index e58131ca..cae354d6 100644
--- a/.github/workflows/on_push_ExtraJobsForMain.yml
+++ b/.github/workflows/on_push_ExtraJobsForMain.yml
@@ -17,7 +17,7 @@ jobs:
 
       - name: install dependencies
         run: |
-          pip3 install conan==1.43.0
+          pip3 install conan==1.45.0
 
       - name: Conan common config
         run: |