Skip to content
Snippets Groups Projects
Commit 2fcec788 authored by Steve Lhomme's avatar Steve Lhomme Committed by Hugo Beauzée-Luyssen
Browse files

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.
parent 4e39cf0e
No related branches found
No related tags found
1 merge request!814CI: update LLVM windows images
Pipeline #150691 passed with stage
in 13 minutes and 49 seconds
Hide whitespace changes
Inline Side-by-side
Showing
with 4 additions and 10 deletions
extras/ci/gitlab-ci.yml
+ 4
− 10
View file @ 2fcec788
...@@ -15,8 +15,8 @@ default: ...@@ -15,8 +15,8 @@ default:
variables: variables:
VLC_WIN32_IMAGE: registry.videolan.org/vlc-debian-win32:20201106141924 VLC_WIN32_IMAGE: registry.videolan.org/vlc-debian-win32:20201106141924
VLC_WIN64_IMAGE: registry.videolan.org/vlc-debian-win64:20201106143728 VLC_WIN64_IMAGE: registry.videolan.org/vlc-debian-win64:20201106143728
VLC_WIN_LLVM_IMAGE: registry.videolan.org/vlc-debian-llvm-mingw:20201201162707 VLC_WIN_LLVM_IMAGE: registry.videolan.org/vlc-debian-llvm-mingw:20211020094514
VLC_UWP_LLVM_IMAGE: registry.videolan.org/vlc-debian-llvm-uwp:20201201150955 VLC_UWP_LLVM_IMAGE: registry.videolan.org/vlc-debian-llvm-uwp:20211020111246
VLC_DEBIAN_IMAGE: registry.videolan.org/vlc-debian-unstable:20210803114245 VLC_DEBIAN_IMAGE: registry.videolan.org/vlc-debian-unstable:20210803114245
VLC_ANDROID_IMAGE: registry.videolan.org/vlc-debian-android:20210730131708 VLC_ANDROID_IMAGE: registry.videolan.org/vlc-debian-android:20210730131708
VLC_SNAP_IMAGE: registry.videolan.org/vlc-ubuntu-focal:20211006143413 VLC_SNAP_IMAGE: registry.videolan.org/vlc-ubuntu-focal:20211006143413
...@@ -162,9 +162,7 @@ win64-llvm: ...@@ -162,9 +162,7 @@ win64-llvm:
extends: .win-common extends: .win-common
image: image:
name: $VLC_WIN_LLVM_IMAGE name: $VLC_WIN_LLVM_IMAGE
variables: variables: *variables-win64
<<: *variables-win64
WINE_SDK_PATH: /usr/include/wine/wine/windows/
win64-ucrt-llvm: win64-ucrt-llvm:
extends: .win-common extends: .win-common
...@@ -172,7 +170,6 @@ win64-ucrt-llvm: ...@@ -172,7 +170,6 @@ win64-ucrt-llvm:
name: $VLC_UWP_LLVM_IMAGE name: $VLC_UWP_LLVM_IMAGE
variables: variables:
<<: *variables-win64 <<: *variables-win64
WINE_SDK_PATH: /usr/include/wine/wine/windows/
TRIPLET: $HOST_ARCH-ucrt-w64-mingw32 TRIPLET: $HOST_ARCH-ucrt-w64-mingw32
UWP_EXTRA_BUILD_FLAGS: -u -x -S 0x0A000006 UWP_EXTRA_BUILD_FLAGS: -u -x -S 0x0A000006
...@@ -224,9 +221,7 @@ nightly-win64-llvm: ...@@ -224,9 +221,7 @@ nightly-win64-llvm:
extends: .nightly-win-common extends: .nightly-win-common
image: image:
name: $VLC_WIN_LLVM_IMAGE name: $VLC_WIN_LLVM_IMAGE
variables: variables: *variables-win64
<<: *variables-win64
WINE_SDK_PATH: /usr/include/wine/wine/windows/
nightly-win64-ucrt-llvm: nightly-win64-ucrt-llvm:
extends: .nightly-win-common extends: .nightly-win-common
...@@ -234,7 +229,6 @@ nightly-win64-ucrt-llvm: ...@@ -234,7 +229,6 @@ nightly-win64-ucrt-llvm:
name: $VLC_UWP_LLVM_IMAGE name: $VLC_UWP_LLVM_IMAGE
variables: variables:
<<: *variables-win64 <<: *variables-win64
WINE_SDK_PATH: /usr/include/wine/wine/windows/
TRIPLET: $HOST_ARCH-ucrt-w64-mingw32 TRIPLET: $HOST_ARCH-ucrt-w64-mingw32
UWP_EXTRA_BUILD_FLAGS: -u -x -S 0x0A000006 UWP_EXTRA_BUILD_FLAGS: -u -x -S 0x0A000006
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

VideoLAN code repository instance