diff options
| author | Xavier Claessens <xavier.claessens@collabora.com> | 2022-03-14 08:56:16 -0400 |
|---|---|---|
| committer | Xavier Claessens <xavier.claessens@collabora.com> | 2022-03-14 08:56:54 -0400 |
| commit | 69863131bdb4ff7f5b51e17f50b0a83522fcc822 (patch) | |
| tree | 735fbf98d83cf15d3822a5f22fe2f5facbba3256 /ci | |
| parent | 0fa792393792a4ae455e138b16606afbc2533f10 (diff) | |
| download | gstreamer-69863131bdb4ff7f5b51e17f50b0a83522fcc822.tar.gz | |
Bump Meson requirement to >=0.60.0
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1934>
Diffstat (limited to 'ci')
| -rw-r--r-- | ci/docker/fedora/prepare.sh | 2 | ||||
| -rw-r--r-- | ci/docker/windows/Dockerfile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ci/docker/fedora/prepare.sh b/ci/docker/fedora/prepare.sh index 5e0563face..0ed4cb6e27 100644 --- a/ci/docker/fedora/prepare.sh +++ b/ci/docker/fedora/prepare.sh @@ -202,7 +202,7 @@ dnf builddep -y gstreamer1 \ python3-gstreamer1 dnf remove -y meson -pip3 install meson==0.59.1 hotdoc python-gitlab +pip3 install meson==0.60.3 hotdoc python-gitlab # Remove gst-devel packages installed by builddep above diff --git a/ci/docker/windows/Dockerfile b/ci/docker/windows/Dockerfile index 59ebf79984..83fbca5168 100644 --- a/ci/docker/windows/Dockerfile +++ b/ci/docker/windows/Dockerfile @@ -44,7 +44,7 @@ RUN Get-ChildItem C:\BuildTools RUN Get-ChildItem C:\BuildTools\VC\Tools\MSVC RUN Get-ChildItem 'C:\Program Files (x86)\Windows Kits\10\lib' -RUN pip3 install meson +RUN pip3 install meson==0.60.3 RUN 'git config --global user.email "cirunner@gstreamer.freedesktop.org"; git config --global user.name "GStreamer CI system"' |