From 06a9f891bda0b09f88e62b8449e1d784fcf27413 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Sat, 5 Oct 2019 00:16:47 +0300 Subject: [PATCH] Update GStreamer to 1.16.1 and explicitly use Debian buster docker images --- .gitlab-ci.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2ba852a0e..88b14c8cc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,7 +10,6 @@ stages: CARGO_HOME: "${CI_PROJECT_DIR}/.cargo_home" DEPENDENCIES: | curl - libssl-dev liborc-0.4-dev libglib2.0-dev libxml2-dev @@ -20,13 +19,14 @@ stages: libgl1-mesa-dri libgl1-mesa-glx libwayland-egl1-mesa + xz-utils before_script: - apt-get update -yqq - apt-get install -yqq --no-install-recommends $DEPENDENCIES - mkdir -p precompiled-gst && cd precompiled-gst - - curl -L https://people.freedesktop.org/~slomo/gstreamer-1.16.0.tar.gz | tar xz + - curl -L https://people.freedesktop.org/~slomo/gstreamer-1.16.1.tar.xz | tar xJ - sed -i "s;prefix=/root/gstreamer;prefix=$PWD/gstreamer;g" $PWD/gstreamer/lib/x86_64-linux-gnu/pkgconfig/*.pc - export PKG_CONFIG_PATH=$PWD/gstreamer/lib/x86_64-linux-gnu/pkgconfig - export GST_PLUGIN_SYSTEM_PATH=$PWD/gstreamer/lib/x86_64-linux-gnu/gstreamer-1.0 @@ -77,19 +77,19 @@ stages: test 1.36: # 1.36 img # https://hub.docker.com/_/rust/ - image: "rust:1.36-slim" + image: "rust:1.36-slim-buster" extends: '.cargo test' test stable: # Stable img # https://hub.docker.com/_/rust/ - image: "rust:slim" + image: "rust:slim-buster" extends: '.cargo test' test stable all-features: # Stable img # https://hub.docker.com/_/rust/ - image: "rust:slim" + image: "rust:slim-buster" variables: ALL_FEATURES: 'yes' extends: '.cargo test' @@ -97,21 +97,21 @@ test stable all-features: test nightly: # Nightly # https://hub.docker.com/r/rustlang/rust/ - image: "rustlang/rust:nightly-slim" + image: "rustlang/rust:nightly-buster-slim" allow_failure: true extends: '.cargo test' test nightly all-features: # Nightly # https://hub.docker.com/r/rustlang/rust/ - image: "rustlang/rust:nightly-slim" + image: "rustlang/rust:nightly-buster-slim" allow_failure: true variables: ALL_FEATURES: 'yes' extends: '.cargo test' rustfmt: - image: "rust:slim" + image: "rust:slim-buster" stage: "lint" script: - rustup component add rustfmt @@ -120,7 +120,7 @@ rustfmt: clippy: extends: '.tarball_setup' - image: "rust:slim" + image: "rust:slim-buster" stage: 'extras' script: - rustup component add clippy-preview