From a49bcfac3770867f466613693bf814e19a083526 Mon Sep 17 00:00:00 2001 From: phunkyfish Date: Mon, 19 Feb 2024 09:22:23 +0000 Subject: [PATCH] [azure] Update pipelines so ARM32 UWP builds but not ARM64 UWP --- azure-pipelines.yml | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 7325f8c..b7bd096 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -5,6 +5,7 @@ trigger: branches: include: - Nexus + - Omega - releases/* paths: include: @@ -24,22 +25,30 @@ jobs: GENERATOR: "Visual Studio 17 2022" ARCHITECTURE: Win32 CONFIGURATION: Release - CMAKE_DEFINES: -DCMAKE_SYSTEM_NAME=Windows -DCMAKE_SYSTEM_VERSION="10.0.17763.0" Win64: GENERATOR: "Visual Studio 17 2022" ARCHITECTURE: x64 CONFIGURATION: Release - CMAKE_DEFINES: -DCMAKE_SYSTEM_NAME=Windows -DCMAKE_SYSTEM_VERSION="10.0.17763.0" + Win32-UWP: + GENERATOR: "Visual Studio 17 2022" + ARCHITECTURE: Win32 + CONFIGURATION: Release + WINSTORE: -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION="10.0.17763.0" Win64-UWP: GENERATOR: "Visual Studio 17 2022" ARCHITECTURE: x64 CONFIGURATION: Release - CMAKE_DEFINES: -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION="10.0.17763.0" - ARM64-UWP: + WINSTORE: -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION="10.0.17763.0" + ARM32-UWP: GENERATOR: "Visual Studio 17 2022" - ARCHITECTURE: ARM64 + ARCHITECTURE: ARM CONFIGURATION: Release - CMAKE_DEFINES: -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION="10.0.17763.0" + WINSTORE: -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION="10.0.17763.0" + #ARM64-UWP: + # GENERATOR: "Visual Studio 17 2022" + # ARCHITECTURE: ARM64 + # CONFIGURATION: Release + # WINSTORE: -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION="10.0.17763.0" workspace: clean: all @@ -59,7 +68,7 @@ jobs: - task: CMake@1 inputs: workingDirectory: 'build' - cmakeArgs: '-T host=x64 -G "$(GENERATOR)" -A $(ARCHITECTURE) $(CMAKE_DEFINES) -DADDONS_TO_BUILD=$(app_id) -DCMAKE_BUILD_TYPE=$(CONFIGURATION) -DADDONS_DEFINITION_DIR=$(Pipeline.Workspace)/$(app_id)/build/definition -DADDON_SRC_PREFIX=../.. -DCMAKE_INSTALL_PREFIX=../../kodi/addons -DPACKAGE_ZIP=1 ../../kodi/cmake/addons' + cmakeArgs: '-T host=x64 -G "$(GENERATOR)" -A $(ARCHITECTURE) $(WINSTORE) -DADDONS_TO_BUILD=$(app_id) -DCMAKE_BUILD_TYPE=$(CONFIGURATION) -DADDONS_DEFINITION_DIR=$(Pipeline.Workspace)/$(app_id)/build/definition -DADDON_SRC_PREFIX=../.. -DCMAKE_INSTALL_PREFIX=../../kodi/addons -DPACKAGE_ZIP=1 ../../kodi/cmake/addons' - task: CMake@1 inputs: