github: fix workflows for meson

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

diff --git a/.github/workflows/coverity.yml b/.github/workflows/coverity.yml
index 218e951b6a74a8ff7f1820c267678b1ba83163f4..379be6156c21630b882c2d756b36e85e92a48e88 100644 (file)
--- a/.github/workflows/coverity.yml
+++ b/.github/workflows/coverity.yml
@@ -24,16 +24,17 @@ jobs:
           sudo apt-get update -qq
           sudo apt-get install -qq gcc clang
           sudo apt-get install -qq libfuse-dev uuid-runtime
+          sudo apt-get install -qq python3 python3-setuptools
+          sudo pip3 install meson ninja
 
       - name: Run coverity
         run: |
           export PATH="$(pwd)/cov-analysis-linux64/bin:${PATH}"
 
-          # Configure
-          ./bootstrap.sh
-          mkdir build
+          meson setup -Dtests=true -Dinit-script=systemd -Dprefix=/usr build/
+          meson compile -C build
+          ninja -C build
           cd build
-          ../configure --prefix=/usr
 
           # Build
           cov-build --dir cov-int make -j4

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index aa5bcedfbd403bd0271f55aa33711628965b4615..19d4803db7397e194843b9526ce2f10cd9212026 100644 (file)
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -28,6 +28,8 @@ jobs:
           sudo apt-get update -qq
           sudo apt-get install -qq gcc clang
           sudo apt-get install -qq libfuse-dev uuid-runtime
+          sudo apt-get install -qq python3 python3-setuptools
+          sudo pip3 install meson==0.55.1 ninja
 
       - name: Compiler version
         env:
@@ -39,17 +41,11 @@ jobs:
         env:
           CC: ${{ matrix.compiler }}
         run: |
-          # Configure
-          ./bootstrap.sh
-          CFLAGS='-g -O0 -std=c11 -DDEBUG -DVERBOSE -DRESOLVE_NOW -Wall -Werror' ./configure --prefix=/usr
-
-          # Build
-          make -j4
-          (cd tests && make tests)
-
+          meson setup -Dtests=true -Dinit-script=systemd -Dprefix=/usr build/
+          ninja -C build
       - name: Test
         env:
           CC: ${{ matrix.compiler }}
         run: |
           echo 1 | sudo tee /sys/fs/cgroup/cpuset/cgroup.clone_children || true
-          sudo -E PATH="${PATH}" LD_LIBRARY_PATH="${LD_LIBRARY_PATH}" tests/main.sh
+          sudo -E PATH="${PATH}" LD_LIBRARY_PATH="${LD_LIBRARY_PATH}" build/tests/main.sh