Merge branch 'master' into bcp-008-01

sony · Jun 24, 2024 · 83d086d · 83d086d
2 parents 667ea4f + 12501c3
commit 83d086d
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'
@@ -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'

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'