mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-16 19:25:18 +00:00
Code Issues 1 Projects Releases Wiki Activity

ci: Ensure only rustc from rustup is installed

Browse source 
We use rustup to source our rustc toolchain, however
due to rust being a common dependency, the toolchain
might get install when installing build depds of
packages.

Ensure rust can cargo are removed if that happens

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/7455>
This commit is contained in:
Jordan Petridis 2024-07-29 14:46:14 +03:00 committed by GStreamer Marge Bot
parent a31c8cf370
commit 815a26f982
3 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
ci/docker/debian/deps.txt
View file

@ -168,7 +168,6 @@ libqt5x11extras5-dev
libraw1394-dev libraw1394-dev
librsvg2-dev librsvg2-dev
librtmp-dev librtmp-dev
librust-wayland-protocols-dev
libsbc-dev libsbc-dev
libsdl2-dev libsdl2-dev
libshaderc1 libshaderc1

2
ci/docker/debian/install-deps.sh
View file

@ -5,6 +5,8 @@ set -eux
apt update -y && apt full-upgrade -y apt update -y && apt full-upgrade -y
apt install -y $(<./ci/docker/debian/deps.txt) apt install -y $(<./ci/docker/debian/deps.txt)
apt remove -y rustc cargo
pip3 install --break-system-packages meson hotdoc python-gitlab tomli junitparser pip3 install --break-system-packages meson hotdoc python-gitlab tomli junitparser
apt clean all apt clean all

3
ci/docker/fedora/install-deps.sh
View file

@ -39,6 +39,9 @@ pip3 install meson hotdoc python-gitlab tomli junitparser
# Remove gst-devel packages installed by builddep above # Remove gst-devel packages installed by builddep above
dnf remove -y "gstreamer1*devel" dnf remove -y "gstreamer1*devel"
# We use rustup to install the rust toolchain, we don't need fedora's
dnf remove -y rust cargo
dnf install -y glib2-doc gdk-pixbuf2-devel gtk3-devel-docs gtk4-devel-docs libsoup-doc dnf install -y glib2-doc gdk-pixbuf2-devel gtk3-devel-docs gtk4-devel-docs libsoup-doc
# Install most debug symbols, except the big ones from things we use # Install most debug symbols, except the big ones from things we use