From b735405fd4c3db50675f58d6129557171f1b32f1 Mon Sep 17 00:00:00 2001
From: Oleg Shparber <oleg@zealdocs.org>
Date: Sun, 17 May 2020 09:56:03 -0400
Subject: [PATCH] ci(github): unify configure & build steps

---
 .github/workflows/build-check.yml | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/build-check.yml b/.github/workflows/build-check.yml
index 229911c..28e8119 100644
--- a/.github/workflows/build-check.yml
+++ b/.github/workflows/build-check.yml
@@ -39,17 +39,18 @@ jobs:
             libqt5x11extras5-dev \
             libsqlite3-dev \
             libxcb-keysyms1-dev \
+            ninja-build \
             qt5-default \
             qtwebengine5-dev
 
-      - name: Configure
-        run: |
-          mkdir -p build
-          cd build
-          cmake -DZEAL_PORTABLE_BUILD="${{ matrix.config.options.ZEAL_PORTABLE_BUILD }}" ..
-
-      - name: Build
-        run: cmake --build build
+      - name: Configure & Build
+        uses: lukka/run-cmake@v2
+        with:
+          buildDirectory: ${{ runner.workspace }}/build/
+          cmakeAppendedArgs: >-
+            -G Ninja
+            -DZEAL_PORTABLE_BUILD=${{ matrix.config.options.ZEAL_PORTABLE_BUILD }}
+          cmakeListsOrSettingsJson: CMakeListsTxtAdvanced
 
   build-windows:
     name: ${{ matrix.config.name }}
@@ -107,7 +108,9 @@ jobs:
         uses: lukka/run-cmake@v2
         with:
           buildDirectory: ${{ runner.workspace }}/build/
-          cmakeAppendedArgs: -GNinja -DZEAL_PORTABLE_BUILD=${{ matrix.config.options.ZEAL_PORTABLE_BUILD }}
+          cmakeAppendedArgs: >-
+            -G Ninja
+            -DZEAL_PORTABLE_BUILD=${{ matrix.config.options.ZEAL_PORTABLE_BUILD }}
           cmakeListsOrSettingsJson: CMakeListsTxtAdvanced
           useVcpkgToolchainFile: true