From 2fcec788723e4dcd9a1bac320138cd4e45049c7c Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@ycbcr.xyz>
Date: Wed, 20 Oct 2021 12:53:06 +0200
Subject: [PATCH] CI: update LLVM windows images
They have the cleaner certificates in case we need them.
They also include their own WINE_SDK_PATH so we don't need to set it.
---
extras/ci/gitlab-ci.yml | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)
diff --git a/extras/ci/gitlab-ci.yml b/extras/ci/gitlab-ci.yml
index b6b4415cc845..9b2250a5ca4e 100644
--- a/extras/ci/gitlab-ci.yml
+++ b/extras/ci/gitlab-ci.yml
@@ -15,8 +15,8 @@ default:
variables:
VLC_WIN32_IMAGE: registry.videolan.org/vlc-debian-win32:20201106141924
VLC_WIN64_IMAGE: registry.videolan.org/vlc-debian-win64:20201106143728
- VLC_WIN_LLVM_IMAGE: registry.videolan.org/vlc-debian-llvm-mingw:20201201162707
- VLC_UWP_LLVM_IMAGE: registry.videolan.org/vlc-debian-llvm-uwp:20201201150955
+ VLC_WIN_LLVM_IMAGE: registry.videolan.org/vlc-debian-llvm-mingw:20211020094514
+ VLC_UWP_LLVM_IMAGE: registry.videolan.org/vlc-debian-llvm-uwp:20211020111246
VLC_DEBIAN_IMAGE: registry.videolan.org/vlc-debian-unstable:20210803114245
VLC_ANDROID_IMAGE: registry.videolan.org/vlc-debian-android:20210730131708
VLC_SNAP_IMAGE: registry.videolan.org/vlc-ubuntu-focal:20211006143413
@@ -162,9 +162,7 @@ win64-llvm:
extends: .win-common
image:
name: $VLC_WIN_LLVM_IMAGE
- variables:
- <<: *variables-win64
- WINE_SDK_PATH: /usr/include/wine/wine/windows/
+ variables: *variables-win64
win64-ucrt-llvm:
extends: .win-common
@@ -172,7 +170,6 @@ win64-ucrt-llvm:
name: $VLC_UWP_LLVM_IMAGE
variables:
<<: *variables-win64
- WINE_SDK_PATH: /usr/include/wine/wine/windows/
TRIPLET: $HOST_ARCH-ucrt-w64-mingw32
UWP_EXTRA_BUILD_FLAGS: -u -x -S 0x0A000006
@@ -224,9 +221,7 @@ nightly-win64-llvm:
extends: .nightly-win-common
image:
name: $VLC_WIN_LLVM_IMAGE
- variables:
- <<: *variables-win64
- WINE_SDK_PATH: /usr/include/wine/wine/windows/
+ variables: *variables-win64
nightly-win64-ucrt-llvm:
extends: .nightly-win-common
@@ -234,7 +229,6 @@ nightly-win64-ucrt-llvm:
name: $VLC_UWP_LLVM_IMAGE
variables:
<<: *variables-win64
- WINE_SDK_PATH: /usr/include/wine/wine/windows/
TRIPLET: $HOST_ARCH-ucrt-w64-mingw32
UWP_EXTRA_BUILD_FLAGS: -u -x -S 0x0A000006
--
GitLab