Merge branch 'mortbopet:master' into Ripes_CLI_with_STDIN

mortbopet · Jan 6, 2025 · c0b34a6 · c0b34a6
2 parents 3359f88 + 1c65351
commit c0b34a6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 12 deletions.
diff --git a/.github/workflows/linux-release.yml b/.github/workflows/linux-release.yml
@@ -7,9 +7,6 @@ on:
 jobs:
   buildUbuntuXenial:
     runs-on: ubuntu-20.04
-    env:
-      CC: gcc-9
-      CXX: g++-9
 
     strategy:
       matrix:
@@ -33,7 +30,8 @@ jobs:
         libxcb-xinerama0 libxcb-composite0 libxcb-cursor0 libxcb-damage0 \
         libxcb-dpms0 libxcb-dri2-0 libxcb-dri3-0 libxcb-ewmh2 libxcb-glx0 \
         libxcb-present0 libxcb-randr0 libxcb-record0 libxcb-render0 libxcb-res0 \
-        libxcb-screensaver0 libxcb-shape0 libxcb-shm0 libxcb-sync1 libxcb-util1 libegl1
+        libxcb-screensaver0 libxcb-shape0 libxcb-shm0 libxcb-sync1 libxcb-util1 libegl1 \
+        ninja-build
 
     - name: Install Qt
       uses: jurplel/install-qt-action@v3
@@ -56,8 +54,8 @@ jobs:
       run: |
         echo "--------------------------------------------------------------"
         echo "building desktop"
-        cmake -DCMAKE_BUILD_TYPE=${{ matrix.build-type }} .
-        make -j $(nproc)
+        cmake -DCMAKE_BUILD_TYPE=${{ matrix.build-type }} . -GNinja
+        ninja
 
     - name: package artifacts
       run: |

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -34,9 +34,7 @@ jobs:
         libxcb-dpms0 libxcb-dri2-0 libxcb-dri3-0 libxcb-ewmh2 libxcb-glx0 \
         libxcb-present0 libxcb-randr0 libxcb-record0 libxcb-render0 libxcb-res0 \
         libxcb-screensaver0 libxcb-shape0 libxcb-shm0 libxcb-sync1 libxcb-util1 \
-        
-        echo "CC=gcc-9" >> $GITHUB_ENV
-        echo "CXX=g++-9" >> $GITHUB_ENV
+        ninja-build
 
         # Dummy display server for CI tests
         Xvfb :99 &
@@ -45,7 +43,7 @@ jobs:
       # MacOS
     - if: contains( matrix.os, 'macos')
       name: Prepare macos container for build
-      run: brew install autoconf automake libtool xz  pkg-config libgit2 libjpg libpng libmtp
+      run: brew install autoconf automake libtool xz  pkg-config libgit2 libjpg libpng libmtp ninja
 
       # Windows
     - if: contains( matrix.os, 'windows')
@@ -76,8 +74,8 @@ jobs:
     - if: "!contains(matrix.os, 'windows')"
       name: build Ripes
       run: |
-        cmake -DRIPES_BUILD_TESTS=ON -DVSRTL_BUILD_TESTS=OFF -DCMAKE_BUILD_TYPE=Release .
-        make -j $(nproc)
+        cmake -GNinja -DRIPES_BUILD_TESTS=ON -DVSRTL_BUILD_TESTS=OFF -DCMAKE_BUILD_TYPE=Release .
+        ninja
 
     - if: contains(matrix.os, 'windows')
       name: build Ripes (Windows)