mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-22 09:41:07 +00:00
Code Issues 1 Projects Releases Wiki Activity

ci: update meson to 1.1.1 in the CI image

Browse source 
co-authored-by: Jordan Petridis <jordan@centricular.com>

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3846>
This commit is contained in:
Andoni Morales Alastruey 2023-01-26 21:42:41 +01:00 committed by GStreamer Marge Bot
parent ebe1f20589
commit 2769986ca9
3 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.gitlab-image-tags.yml
View file

@ -5,7 +5,7 @@ variables:
# If you are hacking on them or need a them to rebuild, its enough
# to change any part of the string of the image you want.
###
FEDORA_TAG: '2023-06-02.0'
FEDORA_TAG: '2023-06-12.0'
INDENT_TAG: '2023-03-16.1'
LINT_TAG: '2023-02-16.5'
WINDOWS_TAG: '2023-06-02.0'
WINDOWS_TAG: '2023-06-12.0'

3
ci/docker/fedora/prepare.sh
View file

@ -207,8 +207,7 @@ dnf remove -y meson
# FIXME: Install ninja from rpm when we update our base image as we fail building
# documentation with rust plugins as we the version from F31 we hit:
# `ninja: error: build.ninja:26557: multiple outputs aren't (yet?) supported by depslog; bring this up on the mailing list if it affects you
pip3 install meson==0.62.2 hotdoc==0.15 python-gitlab ninja tomli
pip3 install meson==1.1.1 hotdoc==0.15 python-gitlab ninja tomli
# Remove gst-devel packages installed by builddep above
dnf remove -y "gstreamer1*devel"

2
ci/docker/windows/Dockerfile
View file

@ -52,7 +52,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==0.62.2
RUN pip3 install meson==1.1.1
RUN 'git config --global user.email "cirunner@gstreamer.freedesktop.org"; git config --global user.name "GStreamer CI system"'