Merge pull request #18374 from mrc0mmand/assorted-ci-tweaks

Assorted CI tweaks

.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"
@@ -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

.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

.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

.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 }}