From f763d0a6b89e118891f03e55f3818ef3483e3517 Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@ycbcr.xyz>
Date: Fri, 29 May 2020 07:12:24 +0200
Subject: [PATCH] CI: add a UWP x86_64 libvlc target
---
extras/ci/gitlab-ci.yml | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/extras/ci/gitlab-ci.yml b/extras/ci/gitlab-ci.yml
index 9dd56a64bc67..41f665f90bd9 100644
--- a/extras/ci/gitlab-ci.yml
+++ b/extras/ci/gitlab-ci.yml
@@ -15,6 +15,7 @@ variables:
VLC_WIN32_IMAGE: registry.videolan.org/vlc-debian-win32:20200602191827
VLC_WIN64_IMAGE: registry.videolan.org/vlc-debian-win64:20200602185103
VLC_WIN_LLVM_IMAGE: registry.videolan.org/vlc-debian-llvm-mingw:20200603153044
+ VLC_UWP_LLVM_IMAGE: registry.videolan.org/vlc-debian-llvm-uwp:20200603145315
VLC_DEBIAN_IMAGE: registry.videolan.org/vlc-debian-unstable:20200229201904
VLC_ANDROID_IMAGE: registry.videolan.org/vlc-debian-android:20190717134531
VLC_SNAP_IMAGE: registry.videolan.org/vlc-ubuntu-bionic:20190627090437
@@ -113,9 +114,9 @@ variables:
fi
if [ -n "$VLC_PREBUILT_CONTRIBS_URL" ]; then
echo "Building using prebuilt contribs at $VLC_PREBUILT_CONTRIBS_URL"
- extras/package/win32/build.sh -p -a $HOST_ARCH $NIGHTLY_EXTRA_BUILD_FLAGS
+ extras/package/win32/build.sh -p -a $HOST_ARCH $NIGHTLY_EXTRA_BUILD_FLAGS $LIBVLC_EXTRA_BUILD_FLAGS $UWP_EXTRA_BUILD_FLAGS
else
- extras/package/win32/build.sh -c -a $HOST_ARCH $NIGHTLY_EXTRA_BUILD_FLAGS
+ extras/package/win32/build.sh -c -a $HOST_ARCH $NIGHTLY_EXTRA_BUILD_FLAGS $LIBVLC_EXTRA_BUILD_FLAGS $UWP_EXTRA_BUILD_FLAGS
fi
win32:
@@ -136,6 +137,15 @@ win64-llvm:
name: $VLC_WIN_LLVM_IMAGE
variables: *variables-win64-llvm
+uwp64-libvlc-llvm:
+ extends: .win-common
+ image:
+ name: $VLC_UWP_LLVM_IMAGE
+ variables:
+ <<: *variables-win64
+ LIBVLC_EXTRA_BUILD_FLAGS: -z
+ UWP_EXTRA_BUILD_FLAGS: -u -w -x
+
.nightly-win-common:
extends: .win-common
only:
--
GitLab