From c0c6809663cecad8866032b2ffbfb93194596c67 Mon Sep 17 00:00:00 2001
From: Frantisek Sumsal <frantisek@sumsal.cz>
Date: Mon, 25 Jan 2021 15:45:36 +0100
Subject: [PATCH 1/3] ci: make the script names a bit more consistent

---
 .github/workflows/{ubuntu-build-check.sh => build_test.sh} | 0
 .github/workflows/build_test.yml                           | 2 +-
 .github/workflows/coverity.yml                             | 2 +-
 .github/workflows/{ubuntu-unit-tests.sh => unit_tests.sh}  | 0
 .github/workflows/unit_tests.yml                           | 4 ++--
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename .github/workflows/{ubuntu-build-check.sh => build_test.sh} (100%)
 rename .github/workflows/{ubuntu-unit-tests.sh => unit_tests.sh} (100%)

diff --git a/.github/workflows/ubuntu-build-check.sh b/.github/workflows/build_test.sh
similarity index 100%
rename from .github/workflows/ubuntu-build-check.sh
rename to .github/workflows/build_test.sh
diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml
index c9aec779c8..e4472511c2 100644
--- a/.github/workflows/build_test.yml
+++ b/.github/workflows/build_test.yml
@@ -26,4 +26,4 @@ jobs:
       - name: Repository checkout
         uses: actions/checkout@v1
       - name: Build check (${{ env.COMPILER }}-${{ env.COMPILER_VERSION }})
-        run: sudo -E .github/workflows/ubuntu-build-check.sh
+        run: sudo -E .github/workflows/build_test.sh
diff --git a/.github/workflows/coverity.yml b/.github/workflows/coverity.yml
index 2c1863779f..a0eb0f01fd 100644
--- a/.github/workflows/coverity.yml
+++ b/.github/workflows/coverity.yml
@@ -29,7 +29,7 @@ jobs:
         run: tools/get-coverity.sh
       # Reuse the setup phase of the unit test script to avoid code duplication
       - name: Install build dependencies
-        run: sudo -E .github/workflows/ubuntu-unit-tests.sh SETUP
+        run: sudo -E .github/workflows/unit_tests.sh SETUP
       # Preconfigure with meson to prevent Coverity from capturing meson metadata
       - name: Preconfigure the build directory
         run: meson cov-build -Dman=false
diff --git a/.github/workflows/ubuntu-unit-tests.sh b/.github/workflows/unit_tests.sh
similarity index 100%
rename from .github/workflows/ubuntu-unit-tests.sh
rename to .github/workflows/unit_tests.sh
diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml
index 9dd1c1b3cf..ca1e6e0c30 100644
--- a/.github/workflows/unit_tests.yml
+++ b/.github/workflows/unit_tests.yml
@@ -18,6 +18,6 @@ jobs:
       - name: Repository checkout
         uses: actions/checkout@v1
       - name: Install build dependencies
-        run: sudo -E .github/workflows/ubuntu-unit-tests.sh SETUP
+        run: sudo -E .github/workflows/unit_tests.sh SETUP
       - name: Build & test (${{ matrix.run_phase }})
-        run: sudo -E .github/workflows/ubuntu-unit-tests.sh RUN_${{ matrix.run_phase }}
+        run: sudo -E .github/workflows/unit_tests.sh RUN_${{ matrix.run_phase }}

From 753803a66c3730ca053ae60ef2c4566e23bd9b5a Mon Sep 17 00:00:00 2001
From: Frantisek Sumsal <frantisek@sumsal.cz>
Date: Mon, 25 Jan 2021 15:49:27 +0100
Subject: [PATCH 2/3] ci: drop an unnecessary sudo

---
 .github/workflows/build_test.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build_test.sh b/.github/workflows/build_test.sh
index c652280bc3..6bed6e29b9 100755
--- a/.github/workflows/build_test.sh
+++ b/.github/workflows/build_test.sh
@@ -80,7 +80,7 @@ elif [[ "$COMPILER" == gcc ]]; then
     AR="gcc-ar-$COMPILER_VERSION"
     # Latest gcc stack deb packages provided by
     # https://launchpad.net/~ubuntu-toolchain-r/+archive/ubuntu/test
-    sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
+    add-apt-repository -y ppa:ubuntu-toolchain-r/test
     PACKAGES+=(gcc-$COMPILER_VERSION)
 else
     fatal "Unknown compiler: $COMPILER"

From 54cf684f5fe0e85c3a34b260e240716550c91f72 Mon Sep 17 00:00:00 2001
From: Frantisek Sumsal <frantisek@sumsal.cz>
Date: Mon, 25 Jan 2021 16:01:56 +0100
Subject: [PATCH 3/3] ci: use the recommended meson syntax

See: docs/HACKING.md
---
 .github/workflows/build_test.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build_test.sh b/.github/workflows/build_test.sh
index 6bed6e29b9..9af1f923d5 100755
--- a/.github/workflows/build_test.sh
+++ b/.github/workflows/build_test.sh
@@ -99,6 +99,8 @@ pip3 install --user -U meson ninja
 export PATH="$HOME/.local/bin:$PATH"
 
 $CC --version
+meson --version
+ninja --version
 
 for args in "${ARGS[@]}"; do
     SECONDS=0
@@ -108,9 +110,8 @@ for args in "${ARGS[@]}"; do
         fatal "meson failed with $args"
     fi
 
-    ninja --version
-    if ! ninja -C build; then
-        fatal "ninja failed with $args"
+    if ! meson compile -C build; then
+        fatal "'meson compile' failed with $args"
     fi
 
     git clean -dxf