diff --git a/.github/workflows/cibuild-setup-ubuntu.sh b/.github/workflows/cibuild-setup-ubuntu.sh index c60210113..12a28f2f4 100755 --- a/.github/workflows/cibuild-setup-ubuntu.sh +++ b/.github/workflows/cibuild-setup-ubuntu.sh @@ -17,6 +17,7 @@ PACKAGES=( ntp socat asciidoctor + meson ) PACKAGES_OPTIONAL=( diff --git a/.github/workflows/cibuild.sh b/.github/workflows/cibuild.sh index d5ad53146..023ab6ed3 100755 --- a/.github/workflows/cibuild.sh +++ b/.github/workflows/cibuild.sh @@ -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 diff --git a/.github/workflows/cibuild.yml b/.github/workflows/cibuild.yml index b999e7aef..9db288f47 100644 --- a/.github/workflows/cibuild.yml +++ b/.github/workflows/cibuild.yml @@ -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