diff options
| author | Jordan Petridis <jordan@centricular.com> | 2023-04-03 18:36:37 +0300 |
|---|---|---|
| committer | GStreamer Marge Bot <gitlab-merge-bot@gstreamer-foundation.org> | 2023-04-03 18:48:55 +0000 |
| commit | 6ce4a12f0bf57e696c7498d0bfe60bfbc8ec4905 (patch) | |
| tree | df67a7da76d7ce2ec00976b244bd71ed15c88c79 /.gitlab-ci.yml | |
| parent | 4e8d0b766cd724897c1d2b0fd0dcb3c56ea3f87a (diff) | |
| download | gstreamer-6ce4a12f0bf57e696c7498d0bfe60bfbc8ec4905.tar.gz | |
ci: Export cargo/rust paths into the build env
Also disable rust for all default builds unless explicitly enabled
(So it won't be automatically enabled now that rustc is in the env)
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4327>
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9b873fcf82..e9f40c4b88 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -55,6 +55,7 @@ variables: -Drtsp_server=enabled -Dvaapi=enabled -Dsharp=disabled + -Drs=disabled -Dgpl=enabled MESON_GST_WERROR: > @@ -245,6 +246,9 @@ commitlint: # build setup templates # .build_template: &build + - export RUSTUP_HOME="/usr/local/rustup" + - export CARGO_HOME="/usr/local/cargo" + - export PATH="/usr/local/cargo/bin:$PATH" - date -R - ci/scripts/handle-subprojects-cache.py subprojects/ - date -R @@ -293,7 +297,6 @@ commitlint: -Domx=enabled -Dgst-omx:target=generic -Ddoc=disabled - -Drs=disabled ${MESON_BUILDTYPE_ARGS} ${MESON_GST_WERROR} |