From 8549046994146118850bae111bf1c7e942d55a1b Mon Sep 17 00:00:00 2001
From: Marijn Suijten <marijns95@gmail.com>
Date: Sat, 12 Dec 2020 13:24:09 +0100
Subject: [PATCH] CI: Test v1_18 feature of egl/wayland/x11 crates

In 55badab1 versioning features were added to these crates after all
(even though they are not used in the actual code, merely to forward the
feature flag to dependencies like `gst` and `gst-gl`). They were omitted
at first and have these special cases in the CI, but those are not
necessary anymore.

Fixes: b2f3363c ("CI: Update to restructured GL EGL/Wayland/X11 layout")
---
 .gitlab-ci.yml | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 41f57ab8e..5c601de35 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -202,8 +202,6 @@ plugins-update-nightly:
         crate=$1
         if [ "$crate" = "gstreamer" ]; then
           echo "--features=ser_de,v1_18"
-        elif [[ "$crate" = gstreamer-gl/* ]]; then
-          echo ""
         else
           echo "--features=v1_18"
         fi
@@ -269,11 +267,7 @@ test nightly all-features:
     - |
       get_features() {
         module=${1%%/sys}
-        if [[ "$module" = gstreamer-gl/* ]]; then
-          echo ""
-        else
-          echo "--features=v1_18"
-        fi
+        echo "--features=v1_18"
       }
       # First build and test all the crates with their relevant features
       # Keep features in sync with below
@@ -348,8 +342,6 @@ clippy:
         crate=$1
         if [ "$crate" = "gstreamer" ]; then
           echo "--features=ser_de,v1_18"
-        elif [[ "$crate" = gstreamer-gl/* ]]; then
-          echo ""
         else
           echo "--features=v1_18"
         fi