Skip to content

Commit 715e159

Browse files
committed
ci: update conan version in ci jobs and dependencies version
1 parent 036af47 commit 715e159

File tree

6 files changed

+11
-11
lines changed

6 files changed

+11
-11
lines changed

.github/workflows/on_PR_linux_matrix.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- name: install dependencies
2020
run: |
2121
sudo apt-get install ninja-build
22-
pip3 install conan==1.43.0
22+
pip3 install conan==1.48.1
2323
2424
- name: Conan common config
2525
run: |

.github/workflows/on_PR_linux_special_buils.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- name: install dependencies
1717
run: |
1818
sudo apt-get install ninja-build
19-
pip3 install conan==1.43.0
19+
pip3 install conan==1.48.1
2020
2121
- name: Conan common config
2222
run: |
@@ -63,7 +63,7 @@ jobs:
6363
run: |
6464
sudo apt-get update
6565
sudo apt-get install valgrind ninja-build
66-
pip3 install conan==1.43.0
66+
pip3 install conan==1.48.1
6767
6868
- name: Conan common config
6969
run: |
@@ -100,7 +100,7 @@ jobs:
100100
- name: install dependencies
101101
run: |
102102
sudo apt-get install ninja-build
103-
pip3 install conan==1.43.0
103+
pip3 install conan==1.48.1
104104
105105
- name: Conan common config
106106
run: |
@@ -136,7 +136,7 @@ jobs:
136136
run: |
137137
sudo apt-get update
138138
sudo apt-get install valgrind doxygen graphviz gettext
139-
pip3 install conan==1.43.0
139+
pip3 install conan==1.48.1
140140
141141
- name: Conan common config
142142
run: |

.github/workflows/on_PR_windows_matrix.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646

4747
- name: Install Conan & Common config
4848
run: |
49-
pip.exe install "conan==1.45.0"
49+
pip.exe install "conan==1.48.1"
5050
conan profile new --detect default
5151
conan profile update settings.build_type=${{matrix.build_type}} default
5252
conan profile update settings.compiler="Visual Studio" default

.github/workflows/on_push_BasicWinLinMac.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131

3232
- name: Install Conan & Common config
3333
run: |
34-
pip.exe install "conan==1.45.0"
34+
pip.exe install "conan==1.48.1"
3535
conan config install https://github.com/conan-io/conanclientcert.git
3636
conan profile new --detect default
3737
conan profile show default
@@ -77,7 +77,7 @@ jobs:
7777
- name: install dependencies
7878
run: |
7979
sudo apt-get install ninja-build
80-
pip3 install conan==1.45.0
80+
pip3 install conan==1.48.1
8181
8282
- name: Conan
8383
run: |

.github/workflows/on_push_ExtraJobsForMain.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717

1818
- name: install dependencies
1919
run: |
20-
pip3 install conan==1.43.0
20+
pip3 install conan==1.48.1
2121
2222
- name: Conan common config
2323
run: |

conanfile.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ def configure(self):
2121
self.options['gtest'].shared = False
2222

2323
def requirements(self):
24-
self.requires('zlib/1.2.11')
24+
self.requires('zlib/1.2.12')
2525

2626
if os_info.is_windows and self.options.iconv:
2727
self.requires('libiconv/1.16')
@@ -37,7 +37,7 @@ def requirements(self):
3737
if self.options.xmp:
3838
self.requires('XmpSdk/2016.7@piponazo/stable') # from conan-piponazo
3939
else:
40-
self.requires('expat/2.4.1')
40+
self.requires('expat/2.4.8')
4141

4242
def imports(self):
4343
self.copy('*.dll', dst='conanDlls', src='bin')

0 commit comments

Comments
 (0)