Skip to content

Commit

Permalink
Merge pull request #398 from sony/fix-windows-conan-build
Browse files Browse the repository at this point in the history
Update Conan version to handle upgraded MSVC compiler
  • Loading branch information
lo-simon authored Jun 21, 2024
2 parents e2830ab + 9e78963 commit 12501c3
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -677,7 +677,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'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/src/build-setup.yml
Original file line number Diff line number Diff line change
@@ -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'
Expand Down

0 comments on commit 12501c3

Please sign in to comment.