diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2022-02-10 15:23:43 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2022-02-11 07:34:06 +1000 |
| commit | d83afd252819fa31bb0934328acce758fbec2c39 (patch) | |
| tree | 9e4622e371bbe3cf5cf28431817ac0214af3451d | |
| parent | 49f642f1667ea03451553e334044b85d3d6bd0d9 (diff) | |
| download | xf86-input-wacom-d83afd252819fa31bb0934328acce758fbec2c39.tar.gz | |
CI: use the Ubuntu python version
This makes CI issues easier to reproduce in a podman container (despite
GitHub's ubuntu image having preinstalled a bunch of stuff).
We're about to use a lot more python-specific stuff so let's not rely on
whatever github installs with the magic python action.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | .github/workflows/build.yml | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9cb1cd6..228f229 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -2,7 +2,10 @@ on: [ push, pull_request ] env: CFLAGS: -Werror -Wall -Wextra -Wno-error=sign-compare -Wno-unused-parameter -Wno-error=missing-field-initializers - UBUNTU_PACKAGES: xutils-dev xserver-xorg-dev libx11-dev libxi-dev libxrandr-dev libxinerama-dev libudev-dev libgirepository1.0-dev libevdev-dev + UBUNTU_PACKAGES: | + xutils-dev xserver-xorg-dev libx11-dev libxi-dev libxrandr-dev libxinerama-dev libudev-dev + libgirepository1.0-dev libevdev-dev + python3-pip PIP_PACKAGES: meson ninja jobs: @@ -66,10 +69,6 @@ jobs: - '-Db_sanitize=address,undefined -Db_lundef=false' steps: - uses: actions/checkout@v2 - # install python so we get pip for meson - - uses: actions/setup-python@v1 - with: - python-version: '3.8' - uses: linuxwacom/libwacom/.github/actions/pkginstall@master with: apt: $UBUNTU_PACKAGES @@ -129,10 +128,6 @@ jobs: TARBALLDIR: '_tarball_dir' INSTALLDIR: '/tmp/_inst' steps: - # install python so we get pip for meson - - uses: actions/setup-python@v1 - with: - python-version: '3.8' - uses: linuxwacom/libwacom/.github/actions/pkginstall@master with: apt: $UBUNTU_PACKAGES |