mirror of
https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs.git
synced 2024-12-22 10:06:29 +00:00
ci: stop installing gtk4 manually
It's now included in the base image we use. https://gitlab.freedesktop.org/gstreamer/gstreamer-rs/-/merge_requests/942
This commit is contained in:
parent
81f5f0f60c
commit
f78b97ba4a
2 changed files with 3 additions and 14 deletions
|
@ -43,19 +43,19 @@ stages:
|
|||
.debian:11-stable:
|
||||
extends: .debian:11
|
||||
variables:
|
||||
FDO_DISTRIBUTION_TAG: '$GST_RS_STABLE-${GST_RS_IMG_TAG}_2021-10-31.0'
|
||||
FDO_DISTRIBUTION_TAG: '$GST_RS_STABLE-${GST_RS_IMG_TAG}_2022-01-12.0'
|
||||
FDO_BASE_IMAGE: "registry.freedesktop.org/gstreamer/gstreamer-rs/debian/bullseye-slim:$GST_RS_STABLE-$GST_RS_IMG_TAG"
|
||||
|
||||
.debian:11-msrv:
|
||||
extends: .debian:11
|
||||
variables:
|
||||
FDO_DISTRIBUTION_TAG: '$GST_RS_MSRV-${GST_RS_IMG_TAG}_2021-10-31.0'
|
||||
FDO_DISTRIBUTION_TAG: '$GST_RS_MSRV-${GST_RS_IMG_TAG}_2022-01-12.0'
|
||||
FDO_BASE_IMAGE: "registry.freedesktop.org/gstreamer/gstreamer-rs/debian/bullseye-slim:$GST_RS_MSRV-$GST_RS_IMG_TAG"
|
||||
|
||||
.debian:11-nightly:
|
||||
extends: .debian:11
|
||||
variables:
|
||||
FDO_DISTRIBUTION_TAG: 'nightly-${GST_RS_IMG_TAG}_2021-10-31.0'
|
||||
FDO_DISTRIBUTION_TAG: 'nightly-${GST_RS_IMG_TAG}_2022-01-12.0'
|
||||
FDO_BASE_IMAGE: "registry.freedesktop.org/gstreamer/gstreamer-rs/debian/bullseye-slim:nightly-$GST_RS_IMG_TAG"
|
||||
|
||||
.build-debian-container:
|
||||
|
@ -66,7 +66,6 @@ stages:
|
|||
FDO_DISTRIBUTION_PACKAGES: "libcsound64-dev llvm clang nasm libsodium-dev"
|
||||
FDO_DISTRIBUTION_EXEC: >-
|
||||
bash ci/install-dav1d.sh &&
|
||||
bash ci/install-gtk4.sh &&
|
||||
apt clean &&
|
||||
bash ./ci/install-rust-ext.sh
|
||||
rules:
|
||||
|
|
|
@ -1,10 +0,0 @@
|
|||
set -eux
|
||||
|
||||
BRANCH=gtk-4-4
|
||||
|
||||
git clone https://gitlab.gnome.org/GNOME/gtk.git --branch $BRANCH --depth=1
|
||||
cd gtk
|
||||
meson build -D prefix=/usr/local
|
||||
ninja -C build
|
||||
ninja -C build install
|
||||
cd ..
|
Loading…
Reference in a new issue