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

[Steve Lhomme]

vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Wed Jun 17 15:17:40 2020 +0200| [a0150e1b648d07ae093b534d0a8bb6b515204d45] | committer: Steve Lhomme

CI: get rid of variables-win64-llvm

Use variables-win64 plus extra variables instead

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=a0150e1b648d07ae093b534d0a8bb6b515204d45
---

 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 41f665f90b..d9303289f0 100644
--- a/extras/ci/gitlab-ci.yml
+++ b/extras/ci/gitlab-ci.yml
@@ -43,12 +43,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
@@ -135,7 +129,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/
 
 uwp64-libvlc-llvm:
     extends: .win-common
@@ -176,7 +172,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