Skip to content

Commit d70e575

Browse files
authored
Merge pull request #2140 from Exiv2/027_CiUpdate
0.27 - Update Windows CI workflows
2 parents 8968ceb + d517044 commit d70e575

File tree

2 files changed

+58
-21
lines changed

2 files changed

+58
-21
lines changed

.github/workflows/on_PR_windows_matrix.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ on:
1111
jobs:
1212
windows:
1313
name: 'Win10 Arch: ${{matrix.platform}} BuildType:${{matrix.build_type}} - SHARED:${{matrix.shared_libraries}}'
14-
runs-on: windows-latest
14+
runs-on: windows-2022
1515

1616
strategy:
1717
fail-fast: false
@@ -46,13 +46,12 @@ jobs:
4646

4747
- name: Install Conan & Common config
4848
run: |
49-
pip.exe install "conan==1.43.0"
50-
conan config install https://github.com/conan-io/conanclientcert.git
49+
pip.exe install "conan==1.45.0"
5150
conan profile new --detect default
5251
conan profile update settings.build_type=${{matrix.build_type}} default
52+
conan profile update settings.compiler="Visual Studio" default
53+
conan profile update settings.compiler.version=17 default
5354
conan config set storage.path=$Env:GITHUB_WORKSPACE/conanCache
54-
conan config get storage.path
55-
tree /f ./conanCache
5655
5756
- name: Conan Arch conditional config
5857
if: ${{matrix.platform == 'x86'}}
@@ -82,7 +81,7 @@ jobs:
8281
-DEXIV2_TEAM_WARNINGS_AS_ERRORS=ON `
8382
-DCMAKE_INSTALL_PREFIX=install `
8483
-S . -B build && `
85-
cmake --build build
84+
cmake --build build --parallel
8685
8786
- name: Install
8887
run: |
@@ -134,13 +133,14 @@ jobs:
134133
-DCMAKE_CXX_FLAGS=-Wno-deprecated \
135134
-DCMAKE_BUILD_TYPE=${{matrix.build_type}} \
136135
-DBUILD_SHARED_LIBS=${{matrix.shared_libraries}} \
136+
-DEXIV2_BUILD_SAMPLES=ON \
137137
-DEXIV2_ENABLE_NLS=ON \
138138
-DEXIV2_ENABLE_WIN_UNICODE=ON \
139139
-DEXIV2_ENABLE_WEBREADY=ON \
140140
-DEXIV2_ENABLE_BMFF=ON \
141141
-DEXIV2_BUILD_UNIT_TESTS=ON \
142142
-S . -B build && \
143-
cmake --build build
143+
cmake --build build --parallel
144144
145145
- name: Test
146146
run: |
@@ -191,7 +191,7 @@ jobs:
191191
-DEXIV2_ENABLE_BMFF=ON \
192192
-DEXIV2_BUILD_UNIT_TESTS=OFF \
193193
-S . -B build && \
194-
cmake --build build
194+
cmake --build build --parallel
195195
196196
- name: Test
197197
run: |

.github/workflows/on_push_BasicWinLinMac.yml

Lines changed: 50 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,13 @@ jobs:
3131

3232
- name: Install Conan & Common config
3333
run: |
34-
pip.exe install "conan==1.43.0"
34+
pip.exe install "conan==1.45.0"
3535
conan config install https://github.com/conan-io/conanclientcert.git
3636
conan profile new --detect default
3737
conan profile show default
38+
conan profile update settings.compiler="Visual Studio" default
39+
conan profile update settings.compiler.version=17 default
40+
conan config set storage.path=$Env:GITHUB_WORKSPACE/conanCache
3841
3942
- name: Run Conan
4043
run: |
@@ -45,10 +48,20 @@ jobs:
4548
4649
- name: Build
4750
run: |
48-
cd build
49-
cmake -GNinja -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=ON -DEXIV2_ENABLE_NLS=OFF -DEXIV2_ENABLE_PNG=ON -DEXIV2_ENABLE_WEBREADY=ON -DEXIV2_ENABLE_BMFF=ON -DEXIV2_BUILD_UNIT_TESTS=ON -DEXIV2_ENABLE_WIN_UNICODE=OFF -DEXIV2_TEAM_WARNINGS_AS_ERRORS=ON -DCMAKE_INSTALL_PREFIX=install ..
50-
cmake --build .
51-
51+
cmake -GNinja `
52+
-DCMAKE_BUILD_TYPE=Release `
53+
-DBUILD_SHARED_LIBS=ON `
54+
-DEXIV2_BUILD_SAMPLES=ON `
55+
-DEXIV2_ENABLE_NLS=OFF `
56+
-DEXIV2_ENABLE_PNG=ON `
57+
-DEXIV2_ENABLE_WEBREADY=ON `
58+
-DEXIV2_ENABLE_BMFF=ON `
59+
-DEXIV2_BUILD_UNIT_TESTS=ON `
60+
-DEXIV2_ENABLE_WIN_UNICODE=OFF `
61+
-DEXIV2_TEAM_WARNINGS_AS_ERRORS=ON `
62+
-DCMAKE_INSTALL_PREFIX=install .. `
63+
-S . -B build && `
64+
cmake --build build --parallel
5265
5366
- name: Test
5467
run: |
@@ -64,22 +77,34 @@ jobs:
6477
- name: install dependencies
6578
run: |
6679
sudo apt-get install ninja-build
67-
pip3 install conan==1.43.0
80+
pip3 install conan==1.45.0
6881
6982
- name: Conan
7083
run: |
7184
mkdir build && cd build
72-
conan config install https://github.com/conan-io/conanclientcert.git
7385
conan profile new --detect default
7486
conan profile update settings.compiler.libcxx=libstdc++11 default
7587
conan profile show default
7688
conan install .. -o webready=True --build missing
7789
7890
- name: build and compile
7991
run: |
80-
cd build
81-
cmake -GNinja -DEXIV2_ENABLE_WEBREADY=ON -DEXIV2_ENABLE_CURL=ON -DEXIV2_BUILD_UNIT_TESTS=ON -DEXIV2_ENABLE_BMFF=ON -DEXIV2_TEAM_WARNINGS_AS_ERRORS=ON -DCMAKE_INSTALL_PREFIX=install -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=ON -DCMAKE_CXX_FLAGS=-Wno-deprecated ..
82-
cmake --build .
92+
cd build && \
93+
cmake -GNinja \
94+
-DCMAKE_BUILD_TYPE=Release \
95+
-DBUILD_SHARED_LIBS=ON \
96+
-DEXIV2_BUILD_SAMPLES=ON \
97+
-DEXIV2_ENABLE_PNG=ON \
98+
-DEXIV2_ENABLE_WEBREADY=ON \
99+
-DEXIV2_ENABLE_CURL=ON \
100+
-DEXIV2_BUILD_UNIT_TESTS=ON \
101+
-DEXIV2_ENABLE_BMFF=ON \
102+
-DEXIV2_TEAM_WARNINGS_AS_ERRORS=ON \
103+
-DCMAKE_INSTALL_PREFIX=install \
104+
-DCMAKE_CXX_FLAGS=-Wno-deprecated \
105+
.. && \
106+
cmake --build . --parallel
107+
83108
84109
- name: Test
85110
run: |
@@ -106,9 +131,21 @@ jobs:
106131
107132
- name: build and compile
108133
run: |
109-
mkdir build && cd build
110-
cmake -GNinja -DEXIV2_ENABLE_WEBREADY=ON -DEXIV2_ENABLE_CURL=ON -DEXIV2_BUILD_UNIT_TESTS=ON -DEXIV2_ENABLE_BMFF=ON -DEXIV2_TEAM_WARNINGS_AS_ERRORS=ON -DCMAKE_INSTALL_PREFIX=install -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=ON -DCMAKE_CXX_FLAGS="-Wno-deprecated-declarations" ..
111-
cmake --build .
134+
mkdir build && cd build && \
135+
cmake -GNinja \
136+
-DCMAKE_BUILD_TYPE=Release \
137+
-DBUILD_SHARED_LIBS=ON \
138+
-DEXIV2_BUILD_SAMPLES=ON \
139+
-DEXIV2_ENABLE_PNG=ON \
140+
-DEXIV2_ENABLE_WEBREADY=ON \
141+
-DEXIV2_ENABLE_CURL=ON \
142+
-DEXIV2_BUILD_UNIT_TESTS=ON \
143+
-DEXIV2_ENABLE_BMFF=ON \
144+
-DEXIV2_TEAM_WARNINGS_AS_ERRORS=ON \
145+
-DCMAKE_INSTALL_PREFIX=install \
146+
-DCMAKE_CXX_FLAGS="-Wno-deprecated-declarations" \
147+
.. && \
148+
cmake --build . --parallel
112149
113150
- name: Test
114151
run: |

0 commit comments

Comments
 (0)