CI: use system ninja

Exiv2 · Feb 13, 2024 · 16584be · 16584be
1 parent a08de6f
commit 16584be
Show file tree

Hide file tree

Showing 9 changed files with 35 additions and 40 deletions.
diff --git a/.github/workflows/on_PR_linux_matrix.yml b/.github/workflows/on_PR_linux_matrix.yml
@@ -23,10 +23,10 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: install dependencies
+      - name: Install dependencies
         run: |
-          sudo apt install -y tree
-          python3 -m pip install conan==1.* ninja
+          sudo apt install -y tree ninja-build
+          python3 -m pip install conan==1.*
 
       - name: Conan common config
         run: |

diff --git a/.github/workflows/on_PR_linux_special_builds.yml b/.github/workflows/on_PR_linux_special_builds.yml
@@ -21,10 +21,10 @@ jobs:
           fetch-depth: 2
           # Trying to deal with warning: ->  Issue detecting commit SHA. Please run actions/checkout with fetch-depth > 1 or set to 0
 
-      - name: install dependencies
+      - name: Install dependencies
         run: |
-          sudo apt-get install -y libxml2-dev libxslt-dev python3-dev
-          python3 -m pip install conan==1.* gcovr ninja
+          sudo apt-get install -y libxml2-dev libxslt-dev python3-dev ninja-build
+          python3 -m pip install conan==1.* gcovr
 
       - name: Conan common config
         run: |
@@ -66,10 +66,10 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: install dependencies
+      - name: Install dependencies
         run: |
-          sudo apt install -y valgrind
-          python3 -m pip install conan==1.* ninja
+          sudo apt install -y valgrind ninja-build
+          python3 -m pip install conan==1.*
 
       - name: Conan common config
         run: |
@@ -101,9 +101,10 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: install dependencies
+      - name: Install dependencies
         run: |
-          python3 -m pip install conan==1.* ninja
+          sudo apt install -y ninja-build
+          python3 -m pip install conan==1.*
 
       - name: Conan common config
         run: |
@@ -134,9 +135,10 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: install dependencies
+      - name: Install dependencies
         run: |
-          python3 -m pip install conan==1.* ninja
+          sudo apt install -y ninja-build
+          python3 -m pip install conan==1.*
 
       - name: Conan common config
         run: |
@@ -155,10 +157,10 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: install dependencies
+      - name: Install dependencies
         run: |
-          sudo apt install -y valgrind doxygen graphviz gettext
-          python3 -m pip install conan==1.* ninja
+          sudo apt install -y valgrind doxygen graphviz gettext ninja-build
+          python3 -m pip install conan==1.*
 
       - name: Conan common config
         run: |

diff --git a/.github/workflows/on_PR_linux_staticAnalysis.yml b/.github/workflows/on_PR_linux_staticAnalysis.yml
@@ -21,7 +21,7 @@ jobs:
           fetch-depth: 2
           # Trying to deal with warning: ->  Issue detecting commit SHA. Please run actions/checkout with fetch-depth > 1 or set to 0
 
-      - name: install dependencies
+      - name: Install dependencies
         run: |
           python3 -m pip install conan==1.*
           sudo add-apt-repository ppa:ubuntu-lxc/daily -y

diff --git a/.github/workflows/on_PR_mac_matrix.yml b/.github/workflows/on_PR_mac_matrix.yml
@@ -11,7 +11,7 @@ on:
 
 jobs:
   MacOS:
-    name: 'MacOS - clang, BuildType:${{matrix.build_type}}, SHARED:${{matrix.shared_libraries}}'
+    name: 'macOS - XCode - ${{matrix.build_type}} - SHARED:${{matrix.shared_libraries}}'
     runs-on: macos-latest
 
     strategy:
@@ -23,11 +23,9 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: install dependencies
+      - name: Install dependencies
         run: |
-          brew install ninja
-          brew install inih
-          brew install googletest
+          brew install ninja inih googletest
 
       - name: Build
         run: |
@@ -41,5 +39,4 @@ jobs:
 
       - name: Test
         run: |
-          cd build
-          ctest --output-on-failure
+          ctest --test-dir build --output-on-failure
diff --git a/.github/workflows/on_PR_mac_special_builds.yml b/.github/workflows/on_PR_mac_special_builds.yml
@@ -12,24 +12,21 @@ on:
 
 jobs:
   MacOS_releaseSanitizers:
-    name: 'MacOS - Clang - Release+Sanitizers'
+    name: 'macOS - XCode - Release+Sanitizers'
     runs-on: macos-latest
 
     steps:
       - uses: actions/checkout@v4
 
-      - name: install dependencies
+      - name: Install dependencies
         run: |
-          brew install ninja
-          brew install inih
-          brew install googletest
+          brew install ninja inih googletest
 
       - name: Build
         run: |
           cmake --preset base_mac -S . -B build -DEXIV2_TEAM_USE_SANITIZERS=ON
           cmake --build build --parallel
 
-      - name: Tests
+      - name: Test
         run: |
-          cd build
-          ctest --output-on-failure
+          ctest --test-dir build --output-on-failure
diff --git a/.github/workflows/on_push_BasicWinLinMac.yml b/.github/workflows/on_push_BasicWinLinMac.yml
@@ -94,9 +94,7 @@ jobs:
 
       - name: Install dependencies
         run: |
-          brew install ninja
-          brew install inih
-          brew install googletest
+          brew install ninja inih googletest
 
       - name: Build
         run: |

diff --git a/.github/workflows/on_push_ExtraJobsForMain.yml b/.github/workflows/on_push_ExtraJobsForMain.yml
@@ -22,9 +22,10 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: install dependencies
+      - name: Install dependencies
         run: |
-          python3 -m pip install conan==1.* gcovr ninja
+          sudo apt-get install ninja-build
+          python3 -m pip install conan==1.* gcovr
 
       - name: Conan common config
         run: |

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -24,8 +24,8 @@ jobs:
 
       - name: Install dependencies
         run: |
-          sudo apt install -y gettext doxygen graphviz
-          python -m pip install conan==1.* ninja
+          sudo apt install -y gettext doxygen graphviz ninja-build
+          python -m pip install conan==1.*
 
       - name: Conan common config
         run: |

diff --git a/ci/install_dependencies.sh b/ci/install_dependencies.sh
@@ -24,7 +24,7 @@ debian_build_gtest() {
 centos_build_inih() {
     [-d inih_build ] || git clone https://github.com/benhoyt/inih.git inih_build
     cd inih_build
-    git checkout r57
+    git checkout r58
     meson --buildtype=plain builddir
     meson compile -C builddir
     meson install -C builddir