Updated Conan version to handle upgraded MSVC compiler on GitHub inst…

…ance
sony · Jun 21, 2024 · bc1e8ac · bc1e8ac
1 parent e2830ab
commit bc1e8ac
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
@@ -121,7 +121,7 @@ jobs:
     - name: install conan
       if: matrix.use_conan == true
       run: |
-        pip install conan~=2.0.5
+        pip install conan~=2.4.1
 
     - name: 'ubuntu-14.04: install cmake'
       if: matrix.os == 'ubuntu-14.04'
@@ -1184,4 +1184,4 @@ jobs:
         git config --global user.name 'test-results-uploader'
         git config --global user.email '[email protected]'
         git commit -qm "Badges for README at ${{ env.GITHUB_COMMIT }}"
-        git push -f `git remote` badges-${{ env.GITHUB_COMMIT }}:badges
+        git push -f `git remote` badges-${{ env.GITHUB_COMMIT }}:badges
diff --git a/.github/workflows/src/build-setup.yml b/.github/workflows/src/build-setup.yml
@@ -1,7 +1,7 @@
 - name: install conan
   if: matrix.use_conan == true
   run: |
-    pip install conan~=2.0.5
+    pip install conan~=2.4.1
 
 - name: 'ubuntu-14.04: install cmake'
   if: matrix.os == 'ubuntu-14.04'