Merge b9677f6 into 8d2f6ad

Exiv2 · Feb 10, 2022 · e7cbaa5 · e7cbaa5
2 parents 8d2f6ad + b9677f6
commit e7cbaa5
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 12 deletions.
diff --git 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
@@ -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
@@ -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,22 +113,20 @@ 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
 
       - name: Run Conan
         run: |
           md build
           cd build
           conan profile list
           conan install .. --build missing
-          dir ..
-          tree /f ../conanCache
 
       - name: Build packaged release
         run: |