From 5b7af0ec1437a53b01d723a4b2cbaa0f7aaea8d8 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Fri, 21 Jan 2022 10:00:46 +1000 Subject: [PATCH] CI: actually test with the various meson args Different variable names and no-one noticed. This means we need to add a few dependencies that weren't needed before. Signed-off-by: Peter Hutterer --- .github/workflows/main.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 96dfe0da..e521be33 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -3,9 +3,12 @@ name: linux on: [ push, pull_request ] env: - UBUNTU_DEP_BUILD: gcc g++ pkg-config systemd libevdev-dev libglib2.0-dev libjson-glib-dev libsystemd-dev libudev-dev libunistring-dev python3-dev python3-evdev swig + UBUNTU_DEP_BUILD: | + gcc g++ pkg-config systemd libevdev-dev libglib2.0-dev + libjson-glib-dev libsystemd-dev libudev-dev libunistring-dev + python3-dev python3-evdev swig python3-sphinx UBUNTU_DEP_TEST: check python3-gi python3-lxml valgrind - PIP_PACKAGES: meson ninja libevdev pyudev pytest + PIP_PACKAGES: meson ninja libevdev pyudev pytest sphinx_rtd_theme jobs: build-and-dist: @@ -23,10 +26,10 @@ jobs: with: apt: $UBUNTU_DEP_BUILD $UBUNTU_DEP_TEST pip: $PIP_PACKAGES - - name: meson test ${{matrix.meson_options}} + - name: meson test ${{matrix.meson_args}} uses: ./.github/actions/meson with: - meson_args: --prefix=$PWD/_instdir ${{matrix.meson_options}} + meson_args: --prefix=$PWD/_instdir ${{matrix.meson_args}} ninja_args: install - name: check installation of data files run: diff -u <(cd data/devices; ls *.device) <(cd _instdir/share/libratbag; ls *.device)