2 files changed, 27 insertions(+), 25 deletions(-)

M .github/workflows/main.yml
M .github/workflows/releases.yaml

@@ 50,13 50,12 @@ jobs:
           submodules: recursive
       - name: Build for RT1051
         run: |
-          ./configure.sh rt1051 Release && \
+          export JOBS=${JOBS:-$(nproc)} && \
+          echo "JOBS=${JOBS}" &&  \
+          ./configure.sh rt1051 Release -G Ninja && \
           pushd build-rt1051-Release && \
-          export JOBS=${JOBS:-`nproc`} && \
-          echo "JOBS=${JOBS}" && \
-          make -j ${JOBS} && \
-          popd && \
-          uptime
+          ninja -j ${JOBS} && \
+          popd 
 
   build_linux_binary_and_run_tests:
     name: build linux binary and run tests


@@ 72,27 71,27 @@ jobs:
           submodules: recursive
       - name: build linux binary
         run: |
-          ./configure.sh linux Debug && \
+          export JOBS=${JOBS:-$(nproc)} && \
+          echo "JOBS=${JOBS}" &&  \
+          ./configure.sh linux Debug -G Ninja && \
           pushd build-linux-Debug && \
-          export JOBS=${JOBS:-`nproc`} && \
-          echo "JOBS=${JOBS}" && \
-          make -j ${JOBS} && \
+          ninja -j ${JOBS} && \
           popd
       - name: Check for statics
         run: ./tools/find_global_data.py build-linux-Debug/PurePhone.elf
       - name: build unit tests
         run: |
+          export JOBS=${JOBS:-$(nproc)} && \
+          echo "JOBS=${JOBS}" &&  \
           pushd build-linux-Debug && \
-          export JOBS=${JOBS:-`nproc`} && \
-          echo "JOBS=${JOBS}" && \
-          make -j ${JOBS} unittests && \
+          ninja -j ${JOBS} unittests && \
           popd
       - name: run unit tests
         run: |
           ./tools/run_unittests.sh enabled_unittests
       - name: store build artefact
         run: |
-          tar cf /artefacts/build-$(git rev-parse --short HEAD).tar build-linux-Debug
+          tar -S -cf /artefacts/build-$(git rev-parse --short HEAD).tar build-linux-Debug
       - name: start emulator
         run: |
           ./run_emulator_on_filesystem_image.sh 2>&1 > emulator.log &

@@ 17,27 17,30 @@ jobs:
     - name: "Style checking"
       run: |
         ./config/pre-commit.hook --last
-    - name: "Unit Tests"
+    - name: Build Unit Tests
       run: |
-        ./configure.sh linux Debug && \
+        export JOBS=${JOBS:-$(nproc)} && \
+        echo "JOBS=${JOBS}" &&  \
+        ./configure.sh linux Debug -G Ninja && \
         pushd build-linux-Debug && \
-        export JOBS=${JOBS:-`nproc`} && \
-        echo "JOBS=${JOBS}" && \
-        make -j ${JOBS} check && \
+        ninja unittests && \
         popd
+    - name: Run unit tests
+      run: |
+        ./tools/run_unittests.sh enabled_unittests
     - name: "Build and package for RT1051"
       id: build_release_package 
       env:
         ASSETS_LOGIN: ${{ secrets.ASSETS_LOGIN }}
         ASSETS_TOKEN: ${{ secrets.ASSETS_TOKEN }}
       run: |
-        ./configure.sh rt1051 RelWithDebInfo && \
+        export JOBS=${JOBS:-$(nproc)} && \
+        echo "JOBS=${JOBS}" &&  \
+        ./configure.sh rt1051 RelWithDebInfo -G Ninja && \
         pushd build-rt1051-RelWithDebInfo && \
-        export JOBS=${JOBS:-`nproc`} && \
-        echo "JOBS=${JOBS}" && \
-        make -j ${JOBS} && \
-        make package-update VERBOSE=1 && \
-        make package-standalone && \
+        ninja -j ${JOBS} && \
+        ninja -j ${JOBS} package-update && \
+        ninja -j ${JOBS} package-standalone && \
         popd && \
         ./print_last_changes.sh && \
         uptime