From 7327666652ca2232fa9d60c3c89abd43d42ccc1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
Date: Fri, 4 Oct 2019 23:58:25 +0300
Subject: [PATCH] Update minimum Rust version to 1.36, 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 8dfbd083a..f7bc8abc7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,7 +14,6 @@ stages:
     G_DEBUG: "fatal_warnings"
     DEPENDENCIES: |
       curl
-      libssl-dev
       liborc-0.4-dev
       libglib2.0-dev
       libxml2-dev
@@ -23,6 +22,7 @@ stages:
       libgl1-mesa-dri
       libgl1-mesa-glx
       libwayland-egl1-mesa
+      xz-utils
 
   <<: *cache
   before_script:
@@ -35,7 +35,7 @@ stages:
 
     - 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
@@ -78,29 +78,29 @@ stages:
                 cargo test -p $crate; \
             done
 
-test 1.31:
-  # 1.31 img
+test 1.36:
+  # 1.36 img
   # https://hub.docker.com/_/rust/
-  image: "rust:1.31-slim"
+  image: "rust:1.36-slim-buster"
   <<: *cargo_test
 
 test stable:
   # Stable img
   # https://hub.docker.com/_/rust/
-  image: "rust:slim"
+  image: "rust:slim-buster"
   <<: *cargo_test
 
 test nightly:
   # Nightly
   # https://hub.docker.com/r/rustlang/rust/
-  image: "rustlang/rust:nightly-slim"
+  image: "rustlang/rust:nightly-buster-slim"
   allow_failure: true
   <<: *cargo_test
 
 .cargo_cross_check_template: &cargo_cross_check
   # Stable img
   # https://hub.docker.com/_/rust/
-  image: "rust:slim"
+  image: "rust:slim-buster"
   stage: "test"
   variables:
     PKG_CONFIG: "true"
@@ -116,7 +116,7 @@ test nightly:
     - cargo check --target $CROSS_TARGET_TRIPLET --all --all-features --color=always
 
 rustfmt:
-  image: "rust:slim"
+  image: "rust:slim-buster"
   stage: "lint"
   script:
     - rustup component add rustfmt