ci: sync workflows with latest changes on main branch

Exiv2 · Mar 10, 2022 · d517044 · d517044
1 parent 8968ceb
commit d517044
Show file tree

Hide file tree

Showing 2 changed files with 58 additions and 21 deletions.
diff --git a/.github/workflows/on_PR_windows_matrix.yml b/.github/workflows/on_PR_windows_matrix.yml
@@ -11,7 +11,7 @@ on:
 jobs:
   windows:
     name: 'Win10 Arch: ${{matrix.platform}} BuildType:${{matrix.build_type}} - SHARED:${{matrix.shared_libraries}}'
-    runs-on: windows-latest
+    runs-on: windows-2022
 
     strategy:
       fail-fast: false
@@ -46,13 +46,12 @@ jobs:
 
       - name: Install Conan & Common config
         run: |
-          pip.exe install "conan==1.43.0"
-          conan config install https://github.com/conan-io/conanclientcert.git
+          pip.exe install "conan==1.45.0"
           conan profile new --detect default
           conan profile update settings.build_type=${{matrix.build_type}} default
+          conan profile update settings.compiler="Visual Studio" default
+          conan profile update settings.compiler.version=17 default
           conan config set storage.path=$Env:GITHUB_WORKSPACE/conanCache
-          conan config get storage.path
-          tree /f ./conanCache
 
       - name: Conan Arch conditional config
         if: ${{matrix.platform == 'x86'}}
@@ -82,7 +81,7 @@ jobs:
             -DEXIV2_TEAM_WARNINGS_AS_ERRORS=ON `
             -DCMAKE_INSTALL_PREFIX=install `
             -S . -B build && `
-          cmake --build build
+          cmake --build build --parallel
 
       - name: Install
         run: |
@@ -134,13 +133,14 @@ jobs:
             -DCMAKE_CXX_FLAGS=-Wno-deprecated \
             -DCMAKE_BUILD_TYPE=${{matrix.build_type}} \
             -DBUILD_SHARED_LIBS=${{matrix.shared_libraries}} \
+            -DEXIV2_BUILD_SAMPLES=ON \
             -DEXIV2_ENABLE_NLS=ON \
             -DEXIV2_ENABLE_WIN_UNICODE=ON \
             -DEXIV2_ENABLE_WEBREADY=ON \
             -DEXIV2_ENABLE_BMFF=ON \
             -DEXIV2_BUILD_UNIT_TESTS=ON \
             -S . -B build && \
-          cmake --build build
+          cmake --build build --parallel
 
       - name: Test
         run: |
@@ -191,7 +191,7 @@ jobs:
             -DEXIV2_ENABLE_BMFF=ON \
             -DEXIV2_BUILD_UNIT_TESTS=OFF \
             -S . -B build && \
-          cmake --build build
+          cmake --build build --parallel
 
       - name: Test
         run: |

diff --git a/.github/workflows/on_push_BasicWinLinMac.yml b/.github/workflows/on_push_BasicWinLinMac.yml
@@ -31,10 +31,13 @@ jobs:
 
       - name: Install Conan & Common config
         run: |
-          pip.exe install "conan==1.43.0"
+          pip.exe install "conan==1.45.0"
           conan config install https://github.com/conan-io/conanclientcert.git
           conan profile new --detect default
           conan profile show default
+          conan profile update settings.compiler="Visual Studio" default
+          conan profile update settings.compiler.version=17 default
+          conan config set storage.path=$Env:GITHUB_WORKSPACE/conanCache
 
       - name: Run Conan
         run: |
@@ -45,10 +48,20 @@ jobs:
 
       - name: Build
         run: |
-          cd build
-          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 ..
-          cmake --build .
-
+          cmake -GNinja `
+            -DCMAKE_BUILD_TYPE=Release `
+            -DBUILD_SHARED_LIBS=ON `
+            -DEXIV2_BUILD_SAMPLES=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 .. `
+            -S . -B build && `
+          cmake --build build --parallel
 
       - name: Test
         run: |
@@ -64,22 +77,34 @@ jobs:
       - name: install dependencies
         run: |
           sudo apt-get install ninja-build
-          pip3 install conan==1.43.0
+          pip3 install conan==1.45.0
 
       - name: Conan
         run: |
           mkdir build && cd build
-          conan config install https://github.com/conan-io/conanclientcert.git
           conan profile new --detect default
           conan profile update settings.compiler.libcxx=libstdc++11 default
           conan profile show default
           conan install .. -o webready=True --build missing
 
       - name: build and compile
         run: |
-          cd build
-          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 ..
-          cmake --build .
+          cd build && \
+          cmake -GNinja \
+            -DCMAKE_BUILD_TYPE=Release \
+            -DBUILD_SHARED_LIBS=ON \
+            -DEXIV2_BUILD_SAMPLES=ON \
+            -DEXIV2_ENABLE_PNG=ON \
+            -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_CXX_FLAGS=-Wno-deprecated \
+            .. && \
+          cmake --build . --parallel
+
 
       - name: Test
         run: |
@@ -106,9 +131,21 @@ jobs:
 
       - name: build and compile
         run: |
-          mkdir build && cd build
-          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" ..
-          cmake --build .
+          mkdir build && cd build && \
+          cmake -GNinja \
+            -DCMAKE_BUILD_TYPE=Release \
+            -DBUILD_SHARED_LIBS=ON \
+            -DEXIV2_BUILD_SAMPLES=ON \
+            -DEXIV2_ENABLE_PNG=ON \
+            -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_CXX_FLAGS="-Wno-deprecated-declarations" \
+            .. && \
+          cmake --build . --parallel
 
       - name: Test
         run: |