summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDudemanguy <random342@airmail.cc>2022-01-08 12:03:21 -0600
committerDudemanguy <random342@airmail.cc>2022-01-09 16:34:50 +0000
commit5ac8f85d3d9f8254923abedd0c7e7746e6c92737 (patch)
treebc19bcdb0660c7956a7a92fff26c120410e5a75b
parente3b835de7c91b8fcdd42652d25f7bafae979fc55 (diff)
downloadmpv-5ac8f85d3d9f8254923abedd0c7e7746e6c92737.tar.bz2
mpv-5ac8f85d3d9f8254923abedd0c7e7746e6c92737.tar.xz
github/workflows: remove some pip3 usages
When this was originally added, some OS package managers were slow and behind the required meson version needed for mpv to build. Both opensuse tumbleweed and freebsd now appear to carry meson 0.60.3 in their repos so we no longer need to do the two-step process of installing pip3 and then installing meson via pip. Instead, just use the OS package manager version.
-rw-r--r--.github/workflows/build.yml9
1 files changed, 2 insertions, 7 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c01ef3a011..c1d7da892e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -126,10 +126,7 @@ jobs:
- name: Install dependencies
run: |
./bootstrap.py
- # TODO: switch back to zypper when OpenSuse updates Meson
- # zypper -n install meson
- zypper -n install python3-pip
- pip install --no-input meson ninja
+ zypper -n install meson
- name: Build with meson
run: |
@@ -166,6 +163,7 @@ jobs:
libplacebo \
libxkbcommon \
luajit \
+ meson \
openal-soft \
pkgconf \
python3 \
@@ -190,8 +188,5 @@ jobs:
uchardet \
v4l_compat \
#
- # Meson from pkg is too old
- python3 -m ensurepip
- pip3 install --no-input meson ninja
run: |
./ci/build-freebsd.sh