From fa9c9bd4cc97abbf3a78b3a643363be4b8611083 Mon Sep 17 00:00:00 2001
From: Luis Diaz <piponazo@gmail.com>
Date: Thu, 10 Feb 2022 09:34:27 +0100
Subject: [PATCH 1/2] Fix release build (see #2085)

---
 .github/workflows/release.yml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index b77c5361..cda6cccd 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -22,7 +22,7 @@ jobs:
       - name: Install dependencies
         run: |
           sudo apt-get install ninja-build gettext doxygen graphviz
-          pip3 install conan==1.43.0
+          pip3 install conan==1.45.0
 
       - name: Conan common config
         run: |
@@ -83,7 +83,7 @@ jobs:
 
   Windows:
     name: 'Build Windows Release'
-    runs-on: windows-latest
+    runs-on: windows-2022
     steps:
       - uses: actions/checkout@v2
 
@@ -113,10 +113,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=Release 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

From b9677f64d72604e7fff3f0de0e1bccfb9ddf3c8d Mon Sep 17 00:00:00 2001
From: Luis Diaz <piponazo@gmail.com>
Date: Thu, 10 Feb 2022 09:37:39 +0100
Subject: [PATCH 2/2] ci: use conan cache in other windows builds

---
 .github/workflows/on_PR_windows_matrix.yml   | 4 ----
 .github/workflows/on_push_BasicWinLinMac.yml | 9 ++++++++-
 .github/workflows/release.yml                | 4 ----
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/on_PR_windows_matrix.yml b/.github/workflows/on_PR_windows_matrix.yml
index eb2e58b3..7792094f 100644
--- a/.github/workflows/on_PR_windows_matrix.yml
+++ b/.github/workflows/on_PR_windows_matrix.yml
@@ -53,8 +53,6 @@ jobs:
           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
 
       - name: Conan Arch conditional config
         if: ${{matrix.platform == 'x86'}}
@@ -68,8 +66,6 @@ jobs:
           cd build
           conan profile list
           conan install .. --build missing
-          dir ..
-          tree /f ../conanCache
 
       - name: Build
         run: |
diff --git a/.github/workflows/on_push_BasicWinLinMac.yml b/.github/workflows/on_push_BasicWinLinMac.yml
index fe13b4dd..c0cae9fc 100644
--- a/.github/workflows/on_push_BasicWinLinMac.yml
+++ b/.github/workflows/on_push_BasicWinLinMac.yml
@@ -27,7 +27,13 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v1
         with:
-          python-version: 3.9
+          python-version: 3.7
+
+      - name: Restore conan cache
+        uses: actions/cache@v2
+        with:
+            path: ${{github.workspace}}/conanCache
+            key: ${{runner.os}}-push-win-${{ hashFiles('conanfile.py') }}
 
       - name: Install Conan & Common config
         run: |
@@ -36,6 +42,7 @@ jobs:
           conan profile show 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
 
       - name: Run Conan
         run: |
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index cda6cccd..15ba113e 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -120,8 +120,6 @@ jobs:
           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
 
       - name: Run Conan
         run: |
@@ -129,8 +127,6 @@ jobs:
           cd build
           conan profile list
           conan install .. --build missing
-          dir ..
-          tree /f ../conanCache
 
       - name: Build packaged release
         run: |