From 1b7c7b5ab1806ea2a4b5abb25088ba2d15c3a73c Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@ycbcr.xyz>
Date: Mon, 7 Mar 2022 10:56:39 +0100
Subject: [PATCH] CI: replace the UWP ARM64 build by a desktop ARM64 Windows
builds
Hopefully Qt can build
---
extras/ci/gitlab-ci.yml | 19 +++++--------------
1 file changed, 5 insertions(+), 14 deletions(-)
diff --git a/extras/ci/gitlab-ci.yml b/extras/ci/gitlab-ci.yml
index 9fde07d55794..b7d03a6b912c 100644
--- a/extras/ci/gitlab-ci.yml
+++ b/extras/ci/gitlab-ci.yml
@@ -51,7 +51,7 @@ variables:
HOST_ARCH: x86_64
TRIPLET: $HOST_ARCH-w64-mingw32
-.variables-uwp-arm64: &variables-uwp-arm64
+.variables-win64-arm: &variables-win64-arm
SHORTARCH: arm64
HOST_ARCH: aarch64
TRIPLET: $HOST_ARCH-w64-mingw32
@@ -164,30 +164,21 @@ win64-llvm:
name: $VLC_WIN_LLVM_IMAGE
variables: *variables-win64
-win64-ucrt-llvm:
+win64-arm-llvm:
extends: .win-common
image:
name: $VLC_UWP_LLVM_IMAGE
variables:
- <<: *variables-win64
- TRIPLET: $HOST_ARCH-ucrt-w64-mingw32
- UWP_EXTRA_BUILD_FLAGS: -u -x -S 0x0A000006
-
-uwp64-libvlc-llvm:
- extends: .win-common
- image:
- name: $VLC_UWP_LLVM_IMAGE
- variables:
- <<: *variables-win64
+ <<: *variables-win64-arm
LIBVLC_EXTRA_BUILD_FLAGS: -z
UWP_EXTRA_BUILD_FLAGS: -u -w -x
-uwp-arm64-libvlc-llvm:
+uwp64-libvlc-llvm:
extends: .win-common
image:
name: $VLC_UWP_LLVM_IMAGE
variables:
- <<: *variables-uwp-arm64
+ <<: *variables-win64
LIBVLC_EXTRA_BUILD_FLAGS: -z
UWP_EXTRA_BUILD_FLAGS: -u -w -x
--
GitLab