]> git.ipfire.org Git - thirdparty/util-linux.git/commitdiff
github: add meson build target
authorKarel Zak <kzak@redhat.com>
Thu, 16 Sep 2021 11:25:07 +0000 (13:25 +0200)
committerKarel Zak <kzak@redhat.com>
Thu, 16 Sep 2021 11:25:07 +0000 (13:25 +0200)
Signed-off-by: Karel Zak <kzak@redhat.com>
.github/workflows/cibuild-setup-ubuntu.sh
.github/workflows/cibuild.sh
.github/workflows/cibuild.yml

index c602101136a29731438f235da0b3677375f1ce66..12a28f2f4cf49584ab0961b2cfd70d209bde02d4 100755 (executable)
@@ -17,6 +17,7 @@ PACKAGES=(
        ntp
        socat
        asciidoctor
+       meson
 )
 
 PACKAGES_OPTIONAL=(
index d5ad5314647b797cf49fd6aa33b1a3d1ea77d22e..023ab6ed3f1d7360eb246985a95cabe76886501f 100755 (executable)
@@ -51,6 +51,12 @@ for phase in "${PHASES[@]}"; do
     INSTALL)
         make install DESTDIR=/tmp/dest
         ;;
+    MESONCONF)
+        meson build
+        ;;
+    MESONBUILD)
+        ninja -C build
+        ;;
     CHECK)
         if [[ "$SANITIZE" == "yes" ]]; then
             # All the following black magic is to make test/eject/umount work, since
index b999e7aefb65322e74c1390fcbca410ff00ccd17..9db288f47edf018d02e435f1e3a78912519e60c0 100644 (file)
@@ -37,6 +37,22 @@ jobs:
         run: sudo -E .github/workflows/cibuild.sh CHECK
       - name: Make install
         run: .github/workflows/cibuild.sh INSTALL
+  meson:
+    needs: build
+    runs-on: ubuntu-latest
+    env:
+      COMPILER: gcc
+      COMPILER_VERSION: 10
+      SANITIZE: no
+    steps:
+      - name: Repository checkout
+        uses: actions/checkout@v1
+      - name: Ubuntu setup
+        run: sudo -E .github/workflows/cibuild-setup-ubuntu.sh
+      - name: Meson configure
+        run: .github/workflows/cibuild.sh MESONCONF
+      - name: Meson build
+        run: .github/workflows/cibuild.sh MESONBUILD
   distcheck:
     needs: build
     runs-on: ubuntu-latest