[vlc-devel] [PATCH] CI: get rid of variables-win64-llvm

[Steve Lhomme]

Use variables-win64 plus extra variables instead
---
 extras/ci/gitlab-ci.yml | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/extras/ci/gitlab-ci.yml b/extras/ci/gitlab-ci.yml
index 9dd56a64bc67..1357c8f4b854 100644
--- a/extras/ci/gitlab-ci.yml
+++ b/extras/ci/gitlab-ci.yml
@@ -42,12 +42,6 @@ variables:
         HOST_ARCH: x86_64
         TRIPLET: $HOST_ARCH-w64-mingw32
 
-.variables-win64-llvm: &variables-win64-llvm
-        SHORTARCH: win64
-        HOST_ARCH: x86_64
-        TRIPLET: $HOST_ARCH-w64-mingw32
-        WINE_SDK_PATH: /usr/include/wine/wine/windows/
-
 .variables-macos: &variables-macos
         VLC_PATH: /Users/videolanci/sandbox/bin
         VLC_FORCE_KERNELVERSION: 18
@@ -134,7 +128,9 @@ win64-llvm:
     extends: .win-common
     image:
         name: $VLC_WIN_LLVM_IMAGE
-    variables: *variables-win64-llvm
+    variables:
+        <<: *variables-win64
+        WINE_SDK_PATH: /usr/include/wine/wine/windows/
 
 .nightly-win-common:
     extends: .win-common
@@ -166,7 +162,9 @@ nightly-win64-llvm:
     extends: .nightly-win-common
     image:
         name: $VLC_WIN_LLVM_IMAGE
-    variables: *variables-win64-llvm
+    variables:
+        <<: *variables-win64
+        WINE_SDK_PATH: /usr/include/wine/wine/windows/
 
 #
 # Debian
-- 
2.26.2