[CI/CD] Use Ninja instead of Make

InfraSail · Aug 31, 2023 · 0394f6a · 0394f6a
1 parent 9a957fb
commit 0394f6a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
@@ -25,9 +25,9 @@ jobs:
         git checkout tags/v24.2
         mkdir build
         cd build
-        cmake -Dprotobuf_BUILD_TESTS=OFF -DCMAKE_BUILD_TYPE=Release ..
-        make
-        sudo make install
+        cmake -Dprotobuf_BUILD_TESTS=OFF -DCMAKE_BUILD_TYPE=Release -G Ninja ..
+        ninja
+        sudo ninja install
         sudo ldconfig
     - name: Install gtest manually
       run: sudo apt-get install libgtest-dev && cd /usr/src/gtest && sudo cmake CMakeLists.txt && sudo make && sudo cp lib/*.a /usr/lib && sudo ln -s /usr/lib/libgtest.a /usr/local/lib/libgtest.a && sudo ln -s /usr/lib/libgtest_main.a /usr/local/lib/libgtest_main.a
@@ -36,10 +36,10 @@ jobs:
       run: git clone https://github.com/nodejs/llhttp.git && cd llhttp && sudo apt-get install npm && npm install && make && sudo make install
     - name: cmake
       working-directory: build
-      run: cmake -DProtobuf_DIR=`pkg-config --variable=prefix protobuf` -DCMAKE_BUILD_TYPE=Release ..
-    - name: make
+      run: cmake -DProtobuf_DIR=`pkg-config --variable=prefix protobuf` -DCMAKE_BUILD_TYPE=Release -G Ninja  ..
+    - name: ninja
       working-directory: build
-      run: make
+      run: ninja
     - name: gtest
       working-directory: ${{github.workspace}}/build/output/bin
       # Execute tests defined by the CMake configuration.  

diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
@@ -30,9 +30,9 @@ jobs:
         git checkout tags/v24.2
         mkdir build
         cd build
-        cmake -Dprotobuf_BUILD_TESTS=OFF -DCMAKE_BUILD_TYPE=Release ..
-        make
-        sudo make install
+        cmake -Dprotobuf_BUILD_TESTS=OFF -DCMAKE_BUILD_TYPE=Release -G Ninja ..
+        ninja
+        sudo ninja install
         sudo ldconfig
 
     - name: Install gtest manually
@@ -45,11 +45,11 @@ jobs:
     - name: Configure CMake
       # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
       # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
-      run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
+      run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -G Ninja 
 
     - name: Build
       # Build your program with the given configuration
-      run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
+      run: cmake -G Ninja --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
 
     - name: Test
       working-directory: ${{github.workspace}}/build/test